Rev 2669: (Daniel Watkins) Fix blackbox.test_add to use internals where appropriate in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2669
revision-id: pqm at pqm.ubuntu.com-20070802202308-j02scq74y5uuzpn2
parent: pqm at pqm.ubuntu.com-20070802072205-gjk1eev6rlw7ght8
parent: d.m.watkins at warwick.ac.uk-20070802170123-ymfewsc7w5kldit4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-02 21:23:08 +0100
message:
  (Daniel Watkins) Fix blackbox.test_add to use internals where appropriate
modified:
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
    ------------------------------------------------------------
    revno: 2664.3.1
    merged: d.m.watkins at warwick.ac.uk-20070802170123-ymfewsc7w5kldit4
    parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: fix-blackbox-tests
    timestamp: Thu 2007-08-02 18:01:23 +0100
    message:
      tests.blackbox.test_add now uses internals where appropriate.
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py	2007-07-24 19:40:40 +0000
+++ b/bzrlib/tests/blackbox/test_add.py	2007-08-02 17:01:23 +0000
@@ -27,7 +27,7 @@
         
     def test_add_reports(self):
         """add command prints the names of added files."""
-        self.run_bzr('init')
+        tree = self.make_branch_and_tree('.')
         self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
         self.build_tree_contents([('.bzrignore', 'CVS\n')])
         out = self.run_bzr('add')[0]
@@ -50,7 +50,7 @@
 
     def test_add_quiet_is(self):
         """add -q does not print the names of added files."""
-        self.run_bzr('init')
+        tree = self.make_branch_and_tree('.') 
         self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
         out = self.run_bzr('add -q')[0]
         # the ordering is not defined at the moment
@@ -62,7 +62,7 @@
 
         "bzr add" should add the parent(s) as necessary.
         """
-        self.run_bzr('init')
+        tree = self.make_branch_and_tree('.')
         self.build_tree(['inertiatic/', 'inertiatic/esp'])
         self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
         self.run_bzr('add inertiatic/esp')
@@ -85,7 +85,7 @@
 
         "bzr add" should do this happily.
         """
-        self.run_bzr('init')
+        tree = self.make_branch_and_tree('.')
         self.build_tree(['inertiatic/', 'inertiatic/esp'])
         self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
         self.run_bzr('add --no-recurse inertiatic')