Merge lp:~mbp/bzr/externalbase into lp:bzr

[Martin Pool]

Change from ExternalBase to scripts, and deprecate it.

We have a separate base class ExternalBase for blackbox tests, but it's really just noise at this point because it adds no new facilities beyond the base test classes, and the blackbox commands aren't even run in an external process (which was the original meaning of the name).

 * deprecate ExternalBase.check_output
 * change subclasses to TestCaseWithTransport
 * change most tests that used it to run_script, which is IMO more readable and less likely to accidentally not check something (and should be no slower)

[Vincent Ladeuil (vila)]

Yeah ! I was stealth-ly working toward the same goal :)

Since you're there, how about replacing 'from bzrlib.tests import TestCaseWithTransport ... (TestCaseWithTransport)' by 'from bzrlib import tests.... (tests.TestCaseWithTransport)' ? :-p

953 - def check_error(self, output, *args):
954 - """Verify that the expected error matches what bzr says.
955 + def check_output(self, output, *args):
956 + """Verify that the expected output matches what bzr says.
957
958 The output is supplied first, so that you can supply a variable
959 number of arguments to bzr.
960 """
961 - self.assertContainsRe(self.run_bzr(args, retcode=3)[1], output)
962 + self.assertEquals(self.run_bzr(*args)[0], output)

Really ? I'm surprised that changing a method name doesn't come with corresponding changes in the tests themselves... This sounds like an intermediate step that you left behind when switching to run_script().

Is it still needed ?

Overall, nice demo of script usefulness... thanks :)

My vote is 'Tweak' make sure you land https://code.edge.launchpad.net/~mbp/bzr/scripts/+merge/27581 first or get rid of it.

review: Needs Fixing

[Martin Pool (mbp)]

On 15 June 2010 18:13, Vincent Ladeuil <email address hidden> wrote:
> Review: Needs Fixing
> Yeah ! I was stealth-ly working toward the same goal :)
>
> Since you're there, how about replacing 'from bzrlib.tests import TestCaseWithTransport ... (TestCaseWithTransport)' by 'from bzrlib import tests.... (tests.TestCaseWithTransport)' ? :-p
>
> 953     - def check_error(self, output, *args):
> 954     - """Verify that the expected error matches what bzr says.
> 955     + def check_output(self, output, *args):
> 956     + """Verify that the expected output matches what bzr says.
> 957
> 958     The output is supplied first, so that you can supply a variable
> 959     number of arguments to bzr.
> 960     """
> 961     - self.assertContainsRe(self.run_bzr(args, retcode=3)[1], output)
> 962     + self.assertEquals(self.run_bzr(*args)[0], output)
>

> Really ? I'm surprised that changing a method name doesn't come with corresponding changes in the tests
themselves... This sounds like an intermediate step that you left
behind when switching to run_script().

Actually this is just a strange diff hunk. test_revision_info
declared a check_error but didn't use it. They did use check_output
from ExternalBase, and weren't particularly suitable for changing to
scripts. So for now I just gave them a check_output of their own.
This is a bit of a sideways step for code cleanliness, but I think
this patch is worthwhile overall, and we could clean
test_revision_info more later.
--
Martin

[Vincent Ladeuil (vila)]

> I think this patch is worthwhile overall, and we could clean
> test_revision_info more later.

Yup, that's why I voted tweak, I'm ok to land this.

review: Approve

[Robert Collins (lifeless)]

This:

195 - self.check_output(revs[1], 'cat-revision a@r-0-1')
196 - self.check_output(revs[2], 'cat-revision a@r-0-2')
197 - self.check_output(revs[3], 'cat-revision a@r-0-3')
198 -
199 - self.check_output(revs[1], 'cat-revision -r 1')
200 - self.check_output(revs[2], 'cat-revision -r 2')
201 - self.check_output(revs[3], 'cat-revision -r 3')
202 -
203 - self.check_output(revs[1], 'cat-revision -r revid:a@r-0-1')
204 - self.check_output(revs[2], 'cat-revision -r revid:a@r-0-2')
205 - self.check_output(revs[3], 'cat-revision -r revid:a@r-0-3')
206 + for i in [1, 2, 3]:
207 + self.assertEqual(revs[i],
208 + self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0])
209 + self.assertEqual(revs[i],
210 + self.run_bzr('cat-revision a@r-0-%d' % i)[0])
211 + self.assertEqual(revs[i],
212 + self.run_bzr('cat-revision -r %d' % i)[0])

Results in harder to evaluate exceptions. I realise its very unlikely to fail but if it does you'll get something like
'serialised_revision' != 'other serialized revision'

and no evidence of *what* revision id we were actually asking for.

I'm going to land this as this code is pretty unlikely to change, but I think we should generally avoid such for loops vigorously: use parameterisation instead, or explicit lists as the test had before.

[Martin Pool (mbp)]

On 21 June 2010 07:25, Robert Collins <email address hidden> wrote:
> This:
>
> 195     -        self.check_output(revs[1], 'cat-revision a@r-0-1')
> 196     -        self.check_output(revs[2], 'cat-revision a@r-0-2')
> 197     -        self.check_output(revs[3], 'cat-revision a@r-0-3')
> 198     -
> 199     -        self.check_output(revs[1], 'cat-revision -r 1')
> 200     -        self.check_output(revs[2], 'cat-revision -r 2')
> 201     -        self.check_output(revs[3], 'cat-revision -r 3')
> 202     -
> 203     -        self.check_output(revs[1], 'cat-revision -r revid:a@r-0-1')
> 204     -        self.check_output(revs[2], 'cat-revision -r revid:a@r-0-2')
> 205     -        self.check_output(revs[3], 'cat-revision -r revid:a@r-0-3')
> 206     +        for i in [1, 2, 3]:
> 207     +            self.assertEqual(revs[i],
> 208     +                self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0])
> 209     +            self.assertEqual(revs[i],
> 210     +                self.run_bzr('cat-revision a@r-0-%d' % i)[0])
> 211     +            self.assertEqual(revs[i],
> 212     +                self.run_bzr('cat-revision -r %d' % i)[0])
>
> Results in harder to evaluate exceptions. I realise its very unlikely to fail but if it does you'll get something like
> 'serialised_revision' != 'other serialized revision'
>
> and no evidence of *what* revision id we were actually asking for.
>
> I'm going to land this as this code is pretty unlikely to change, but I think we should generally avoid such for loops vigorously: use parameterisation instead, or explicit lists as the test had before.

I think the exception from run_bzr tells you what command it's
running, so that should make it quite clear what failed. If your test
framework tells you "manually unroll loops by copy&paste" then the
framework is buggy. :-)

--
Martin

[Robert Collins (lifeless)]

I agree that the test framework is buggy :) - I did say that using parameterisation would be better, I think. Anyhow, its all moot - it was landed as is .

[Martin Pool (mbp)]

On 22 June 2010 09:30, Robert Collins <email address hidden> wrote:
> I agree that the test framework is buggy :) - I did say that using parameterisation would be better, I think. Anyhow, its all moot - it was landed as is .

It's not really obvious to me how you would parameterize this. What
would you do?

If I wanted to get rid of the for loop I'd probably delete all but one
case, because they're not really covering anything different. But for
a cleanup I wanted to make a smaller change.

--
Martin

[Robert Collins (lifeless)]

On Tue, Jun 22, 2010 at 1:22 PM, Martin Pool <email address hidden> wrote:
> On 22 June 2010 09:30, Robert Collins <email address hidden> wrote:
>> I agree that the test framework is buggy :) - I did say that using parameterisation would be better, I think. Anyhow, its all moot - it was landed as is .
>
> It's not really obvious to me how you would parameterize this.  What
> would you do?

Make a scenario per revid I wanted to test with, and seperately a
scenario for testing that 1 rev in N is accessible, and possibly cross
multiply them.

-Rob

=== modified file 'NEWS'
--- NEWS	2010-06-15 06:35:40 +0000
+++ NEWS	2010-06-15 06:35:41 +0000
@@ -103,6 +103,11 @@
   ``bzrlib.patiencediff`` instead.
   (Andrew Bennetts)
 
+* ``bzrlib.tests.blackbox.ExternalBase`` is deprecated.  It provided only
+  one method ``check_output``, and we now recommend checking command
+  output using ``run_script``.
+  (Martin Pool)
+
 Internals
 *********
 

=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- bzrlib/tests/blackbox/__init__.py	2010-05-03 09:19:15 +0000
+++ bzrlib/tests/blackbox/__init__.py	2010-06-15 06:35:41 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 """
 
 
+from bzrlib.symbol_versioning import (
+    deprecated_in,
+    deprecated_method,
+    )
 from bzrlib import tests
 
 
@@ -126,7 +130,9 @@
 
 
 class ExternalBase(tests.TestCaseWithTransport):
+    """Don't use this class anymore, use TestCaseWithTransport or similar"""
 
+    @deprecated_method(deprecated_in((2, 2, 0)))
     def check_output(self, output, *args):
         """Verify that the expected output matches what bzr says.
 

=== modified file 'bzrlib/tests/blackbox/test_added.py'
--- bzrlib/tests/blackbox/test_added.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_added.py	2010-06-15 06:35:41 +0000
@@ -21,10 +21,10 @@
 import os
 
 from bzrlib.branch import Branch
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestAdded(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestAdded(TestCaseWithTransport):
 
     def test_added(self):
         """Test that 'added' command reports added files"""

=== modified file 'bzrlib/tests/blackbox/test_alias.py'
--- bzrlib/tests/blackbox/test_alias.py	2010-04-29 03:23:18 +0000
+++ bzrlib/tests/blackbox/test_alias.py	2010-06-15 06:35:41 +0000
@@ -19,11 +19,11 @@
 import os
 import codecs
 
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
-class TestAlias(ExternalBase):
+class TestAlias(TestCaseWithTransport):
 
     def test_list_alias_with_none(self):
         """Calling alias with no parameters lists existing aliases."""

=== modified file 'bzrlib/tests/blackbox/test_aliases.py'
--- bzrlib/tests/blackbox/test_aliases.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_aliases.py	2010-06-15 06:35:41 +0000
@@ -19,12 +19,12 @@
 import os
 
 from bzrlib.branch import Branch
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.trace import mutter
 from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
-class TestAliases(ExternalBase):
+class TestAliases(TestCaseWithTransport):
 
     def test_aliases(self):
 

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- bzrlib/tests/blackbox/test_branch.py	2010-04-22 17:08:27 +0000
+++ bzrlib/tests/blackbox/test_branch.py	2010-06-15 06:35:41 +0000
@@ -27,7 +27,7 @@
     revision as _mod_revision,
     )
 from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.tests import (
     KnownFailure,
     HardlinkFeature,
@@ -38,7 +38,7 @@
 from bzrlib.workingtree import WorkingTree
 
 
-class TestBranch(ExternalBase):
+class TestBranch(TestCaseWithTransport):
 
     def example_branch(self, path='.'):
         tree = self.make_branch_and_tree(path)
@@ -248,7 +248,7 @@
         self.assertLength(2, calls)
 
 
-class TestBranchStacked(ExternalBase):
+class TestBranchStacked(TestCaseWithTransport):
     """Tests for branch --stacked"""
 
     def assertRevisionInRepository(self, repo_path, revid):
@@ -376,7 +376,7 @@
             err)
 
 
-class TestSmartServerBranching(ExternalBase):
+class TestSmartServerBranching(TestCaseWithTransport):
 
     def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
         self.setup_smart_server_with_call_log()

=== modified file 'bzrlib/tests/blackbox/test_break_lock.py'
--- bzrlib/tests/blackbox/test_break_lock.py	2010-03-25 09:39:03 +0000
+++ bzrlib/tests/blackbox/test_break_lock.py	2010-06-15 06:35:41 +0000
@@ -25,10 +25,10 @@
     )
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestBreakLock(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestBreakLock(TestCaseWithTransport):
 
     # General principal for break-lock: All the elements that might be locked
     # by a bzr operation on PATH, are candidates that break-lock may unlock.
@@ -93,7 +93,7 @@
         self.assertRaises(errors.LockBroken, self.master_branch.unlock)
 
 
-class TestBreakLockOldBranch(ExternalBase):
+class TestBreakLockOldBranch(TestCaseWithTransport):
 
     def test_break_lock_format_5_bzrdir(self):
         # break lock on a format 5 bzrdir should just return

=== modified file 'bzrlib/tests/blackbox/test_cat_revision.py'
--- bzrlib/tests/blackbox/test_cat_revision.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_cat_revision.py	2010-06-15 06:35:41 +0000
@@ -14,10 +14,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from bzrlib.tests import blackbox
-
-
-class TestCatRevision(blackbox.ExternalBase):
+
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestCatRevision(TestCaseWithTransport):
 
     def test_cat_unicode_revision(self):
         tree = self.make_branch_and_tree('.')
@@ -47,17 +48,13 @@
         finally:
             r.unlock()
 
-        self.check_output(revs[1], 'cat-revision a@r-0-1')
-        self.check_output(revs[2], 'cat-revision a@r-0-2')
-        self.check_output(revs[3], 'cat-revision a@r-0-3')
-
-        self.check_output(revs[1], 'cat-revision -r 1')
-        self.check_output(revs[2], 'cat-revision -r 2')
-        self.check_output(revs[3], 'cat-revision -r 3')
-
-        self.check_output(revs[1], 'cat-revision -r revid:a@r-0-1')
-        self.check_output(revs[2], 'cat-revision -r revid:a@r-0-2')
-        self.check_output(revs[3], 'cat-revision -r revid:a@r-0-3')
+        for i in [1, 2, 3]:
+            self.assertEqual(revs[i],
+                self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0])
+            self.assertEqual(revs[i],
+                self.run_bzr('cat-revision a@r-0-%d' % i)[0])
+            self.assertEqual(revs[i],
+                self.run_bzr('cat-revision -r %d' % i)[0])
 
     def test_cat_no_such_revid(self):
         tree = self.make_branch_and_tree('.')

=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- bzrlib/tests/blackbox/test_check.py	2009-08-04 04:36:34 +0000
+++ bzrlib/tests/blackbox/test_check.py	2010-06-15 06:35:41 +0000
@@ -17,10 +17,10 @@
 """Tests for the 'check' CLI command."""
 
 from bzrlib.tests import ChrootedTestCase
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestCheck(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestCheck(TestCaseWithTransport):
 
     def test_check_no_tree(self):
         self.make_branch('.')

=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
--- bzrlib/tests/blackbox/test_checkout.py	2010-05-12 12:55:04 +0000
+++ bzrlib/tests/blackbox/test_checkout.py	2010-06-15 06:35:41 +0000
@@ -28,8 +28,8 @@
     errors,
     workingtree,
     )
-from bzrlib.tests.blackbox import (
-    ExternalBase,
+from bzrlib.tests import (
+    TestCaseWithTransport,
     )
 from bzrlib.tests import (
     HardlinkFeature,
@@ -37,7 +37,7 @@
     )
 
 
-class TestCheckout(ExternalBase):
+class TestCheckout(TestCaseWithTransport):
 
     def setUp(self):
         super(TestCheckout, self).setUp()

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2010-05-20 18:23:17 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2010-06-15 06:35:41 +0000
@@ -33,10 +33,10 @@
     probe_bad_non_ascii,
     TestSkipped,
     )
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestCommit(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestCommit(TestCaseWithTransport):
 
     def test_05_empty_commit(self):
         """Commit of tree with no versioned files should fail"""

=== modified file 'bzrlib/tests/blackbox/test_deleted.py'
--- bzrlib/tests/blackbox/test_deleted.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_deleted.py	2010-06-15 06:35:41 +0000
@@ -21,10 +21,10 @@
 import os
 
 from bzrlib.branch import Branch
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestDeleted(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestDeleted(TestCaseWithTransport):
 
     def test_deleted_directory(self):
         """Test --directory option"""

=== modified file 'bzrlib/tests/blackbox/test_dpush.py'
--- bzrlib/tests/blackbox/test_dpush.py	2010-04-28 10:30:48 +0000
+++ bzrlib/tests/blackbox/test_dpush.py	2010-06-15 06:35:41 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010 Canonical Ltd
+# Copyright (C) 2005, 2007, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
     )
 from bzrlib.tests import (
     blackbox,
+    script,
     test_foreign,
     )
 from bzrlib.tests.blackbox import test_push
@@ -58,7 +59,7 @@
     return result
 
 
-class TestDpush(blackbox.ExternalBase):
+class TestDpush(tests.TestCaseWithTransport):
 
     def setUp(self):
         super(TestDpush, self).setUp()
@@ -86,9 +87,11 @@
         self.build_tree(("dc/foo", "blaaaa"))
         dc.open_workingtree().commit('msg')
 
-        output, error = self.run_bzr("dpush -d dc d")
-        self.assertEquals(error, "Pushed up to revision 2.\n")
-        self.check_output("", "status dc")
+        script.run_script(self, """
+            $ bzr dpush -d dc d
+            2>Pushed up to revision 2.
+            $ bzr status dc
+            """)
 
     def test_dpush_new(self):
         b = self.make_dummy_builder('d').get_branch()
@@ -99,9 +102,12 @@
         dc_tree.add("foofile")
         dc_tree.commit("msg")
 
-        self.check_output("", "dpush -d dc d")
-        self.check_output("2\n", "revno dc")
-        self.check_output("", "status dc")
+        script.run_script(self, '''
+            $ bzr dpush -d dc d
+            $ bzr revno dc
+            2
+            $ bzr status dc
+            ''')
 
     def test_dpush_wt_diff(self):
         b = self.make_dummy_builder('d').get_branch()
@@ -113,11 +119,17 @@
         newrevid = dc_tree.commit('msg')
 
         self.build_tree_contents([("dc/foofile", "blaaaal")])
-        self.check_output("", "dpush -d dc d --no-strict")
+        script.run_script(self, '''
+            $ bzr dpush -d dc d --no-strict
+            ''')
         self.assertFileEqual("blaaaal", "dc/foofile")
         # if the dummy vcs wasn't that dummy we could uncomment the line below
         # self.assertFileEqual("blaaaa", "d/foofile")
-        self.check_output('modified:\n  foofile\n', "status dc")
+        script.run_script(self, '''
+            $ bzr status dc
+            modified:
+              foofile
+            ''')
 
     def test_diverged(self):
         builder = self.make_dummy_builder('d')

=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- bzrlib/tests/blackbox/test_export.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_export.py	2010-06-15 06:35:41 +0000
@@ -30,10 +30,10 @@
     export,
     tests,
     )
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestExport(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestExport(TestCaseWithTransport):
 
     def test_tar_export(self):
         tree = self.make_branch_and_tree('tar')

=== modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py'
--- bzrlib/tests/blackbox/test_filesystem_cicp.py	2010-04-28 07:53:34 +0000
+++ bzrlib/tests/blackbox/test_filesystem_cicp.py	2010-06-15 06:35:41 +0000
@@ -19,13 +19,16 @@
 
 import os
 
-from bzrlib import (osutils,
+from bzrlib import (
+    osutils,
+    tests,
     )
-from bzrlib.tests.blackbox import ExternalBase
 from bzrlib.tests import CaseInsCasePresFilenameFeature, KnownFailure
 from bzrlib.osutils import canonical_relpath, pathjoin
-
-class TestCICPBase(ExternalBase):
+from bzrlib.tests.script import run_script
+
+
+class TestCICPBase(tests.TestCaseWithTransport):
     """Base class for tests on a case-insensitive, case-preserving filesystem.
     """
 
@@ -42,16 +45,6 @@
                                  ])
         return wt
 
-    def check_error_output(self, retcode, output, *args):
-        got = self.run_bzr(retcode=retcode, *args)[1]
-        self.failUnlessEqual(got, output)
-
-    def check_empty_output(self, *args):
-        """Check a bzr command generates no output anywhere and exits with 0"""
-        out, err = self.run_bzr(retcode=0, *args)
-        self.failIf(out)
-        self.failIf(err)
-
 
 class TestAdd(TestCICPBase):
 
@@ -60,28 +53,32 @@
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case name
         self.build_tree(['CamelCase'])
-
-        self.check_output('adding CamelCase\n', 'add camelcase')
+        run_script(self, """
+            $ bzr add camelcase
+            adding CamelCase
+            """)
 
     def test_add_subdir(self):
         """test_add_simple but with subdirectories tested too."""
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case parent and base name
         self.build_tree(['CamelCaseParent/', 'CamelCaseParent/CamelCase'])
-
-        self.check_output('adding CamelCaseParent\n'
-                          'adding CamelCaseParent/CamelCase\n',
-                          'add camelcaseparent/camelcase')
+        run_script(self, """
+            $ bzr add camelcaseparent/camelcase
+            adding CamelCaseParent
+            adding CamelCaseParent/CamelCase
+            """)
 
     def test_add_implied(self):
         """test add with no args sees the correct names."""
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case parent and base name
         self.build_tree(['CamelCaseParent/', 'CamelCaseParent/CamelCase'])
-
-        self.check_output('adding CamelCaseParent\n'
-                          'adding CamelCaseParent/CamelCase\n',
-                          'add')
+        run_script(self, """
+            $ bzr add
+            adding CamelCaseParent
+            adding CamelCaseParent/CamelCase
+            """)
 
     def test_re_add(self):
         """Test than when a file has 'unintentionally' changed case, we can't
@@ -89,10 +86,15 @@
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case name
         self.build_tree(['MixedCase'])
-        self.check_output('adding MixedCase\n', 'add MixedCase')
+        run_script(self, """
+            $ bzr add MixedCase
+            adding MixedCase
+            """)
         # 'accidently' rename the file on disk
         osutils.rename('MixedCase', 'mixedcase')
-        self.check_empty_output('add mixedcase')
+        run_script(self, """
+            $ bzr add mixedcase
+            """)
 
     def test_re_add_dir(self):
         # like re-add, but tests when the operation is on a directory.
@@ -101,12 +103,16 @@
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case name
         self.build_tree(['MixedCaseParent/', 'MixedCaseParent/MixedCase'])
-        self.check_output('adding MixedCaseParent\n'
-                          'adding MixedCaseParent/MixedCase\n',
-                          'add MixedCaseParent')
+        run_script(self, """
+            $ bzr add MixedCaseParent
+            adding MixedCaseParent
+            adding MixedCaseParent/MixedCase
+            """)
         # 'accidently' rename the directory on disk
         osutils.rename('MixedCaseParent', 'mixedcaseparent')
-        self.check_empty_output('add mixedcaseparent')
+        run_script(self, """
+            $ bzr add mixedcaseparent
+            """)
 
     def test_add_not_found(self):
         """Test add when the input file doesn't exist."""
@@ -114,31 +120,34 @@
         # create a file on disk with the mixed-case name
         self.build_tree(['MixedCaseParent/', 'MixedCaseParent/MixedCase'])
         expected_fname = pathjoin(wt.basedir, "MixedCaseParent", "notfound")
-        expected_msg = "bzr: ERROR: No such file: %r\n" % expected_fname
-        self.check_error_output(3, expected_msg, 'add mixedcaseparent/notfound')
+        run_script(self, """
+            $ bzr add mixedcaseparent/notfound
+            2>bzr: ERROR: No such file: %s
+            """ % (repr(expected_fname),))
 
 
 class TestMove(TestCICPBase):
+
     def test_mv_newname(self):
         wt = self._make_mixed_case_tree()
-        self.run_bzr('add')
-        self.run_bzr('ci -m message')
-
-        self.check_output(
-            'CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
-            'mv camelcaseparent/camelcase camelcaseparent/NewCamelCase')
+        run_script(self, """
+            $ bzr add
+            $ bzr ci -m message
+            $ bzr mv camelcaseparent/camelcase camelcaseparent/NewCamelCase
+            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase
+            """)
 
     def test_mv_newname_after(self):
         wt = self._make_mixed_case_tree()
-        self.run_bzr('add')
-        self.run_bzr('ci -m message')
-        osutils.rename('CamelCaseParent/CamelCase', 'CamelCaseParent/NewCamelCase')
-
         # In this case we can specify the incorrect case for the destination,
         # as we use --after, so the file-system is sniffed.
-        self.check_output(
-            'CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
-            'mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase')
+        run_script(self, """
+            $ bzr add 
+            $ bzr ci -m message
+            $ mv CamelCaseParent/CamelCase CamelCaseParent/NewCamelCase
+            $ bzr mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase
+            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase
+            """)
 
     def test_mv_newname_exists(self):
         # test a mv, but when the target already exists with a name that
@@ -146,8 +155,11 @@
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
         self.run_bzr('ci -m message')
-        ex = 'bzr: ERROR: Could not move CamelCase => lowercase: lowercaseparent/lowercase is already versioned.\n'
-        self.check_error_output(3, ex, 'mv camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE')
+        run_script(self, """
+            $ bzr mv camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE
+            2>bzr: ERROR: Could not move CamelCase => lowercase: \
+lowercaseparent/lowercase is already versioned.
+            """)
 
     def test_mv_newname_exists_after(self):
         # test a 'mv --after', but when the target already exists with a name
@@ -160,27 +172,32 @@
         # bzr should report that the filename is already versioned.
         os.unlink('CamelCaseParent/CamelCase')
         osutils.rename('lowercaseparent/lowercase', 'lowercaseparent/LOWERCASE')
-        ex = 'bzr: ERROR: Could not move CamelCase => lowercase: lowercaseparent/lowercase is already versioned.\n'
-        self.check_error_output(3, ex, 'mv --after camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE')
+        run_script(self, """
+            $ bzr mv --after camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE
+            2>bzr: ERROR: Could not move CamelCase => lowercase: \
+lowercaseparent/lowercase is already versioned.
+            """)
 
     def test_mv_newname_root(self):
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
         self.run_bzr('ci -m message')
-
-        self.check_output('CamelCaseParent => NewCamelCaseParent\n',
-                          'mv camelcaseparent NewCamelCaseParent')
+        run_script(self, """
+            $ bzr mv camelcaseparent NewCamelCaseParent
+            CamelCaseParent => NewCamelCaseParent
+            """)
 
     def test_mv_newname_root_after(self):
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
         self.run_bzr('ci -m message')
-        osutils.rename('CamelCaseParent', 'NewCamelCaseParent')
-
         # In this case we can specify the incorrect case for the destination,
         # as we use --after, so the file-system is sniffed.
-        self.check_output('CamelCaseParent => NewCamelCaseParent\n',
-                          'mv --after camelcaseparent newcamelcaseparent')
+        run_script(self, """
+            $ mv CamelCaseParent NewCamelCaseParent
+            $ bzr mv --after camelcaseparent NewCamelCaseParent
+            CamelCaseParent => NewCamelCaseParent
+            """)
 
     def test_mv_newcase(self):
         wt = self._make_mixed_case_tree()
@@ -189,8 +206,10 @@
 
         # perform a mv to the new case - we expect bzr to accept the new
         # name, as specified, and rename the file on the file-system too.
-        self.check_output('CamelCaseParent/CamelCase => CamelCaseParent/camelCase\n',
-                          'mv camelcaseparent/camelcase camelcaseparent/camelCase')
+        run_script(self, """
+            $ bzr mv camelcaseparent/camelcase camelcaseparent/camelCase
+            CamelCaseParent/CamelCase => CamelCaseParent/camelCase
+            """)
         self.failUnlessEqual(canonical_relpath(wt.basedir, 'camelcaseparent/camelcase'),
                              'CamelCaseParent/camelCase')
 
@@ -202,8 +221,10 @@
         # perform a mv to the new case - we must ensure the file-system has the
         # new case first.
         osutils.rename('CamelCaseParent/CamelCase', 'CamelCaseParent/camelCase')
-        self.check_output('CamelCaseParent/CamelCase => CamelCaseParent/camelCase\n',
-                          'mv --after camelcaseparent/camelcase camelcaseparent/camelCase')
+        run_script(self, """
+            $ bzr mv --after camelcaseparent/camelcase camelcaseparent/camelCase
+            CamelCaseParent/CamelCase => CamelCaseParent/camelCase
+            """)
         # bzr should not have renamed the file to a different case
         self.failUnlessEqual(canonical_relpath(wt.basedir, 'camelcaseparent/camelcase'),
                              'CamelCaseParent/camelCase')
@@ -212,9 +233,11 @@
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
         self.run_bzr('ci -m message')
-        self.check_output('lowercaseparent/lowercase => CamelCaseParent/lowercase\n'
-                          'lowercaseparent/mixedCase => CamelCaseParent/mixedCase\n',
-                          'mv LOWercaseparent/LOWercase LOWercaseparent/MIXEDCase camelcaseparent')
+        run_script(self, """
+            $ bzr mv LOWercaseparent/LOWercase LOWercaseparent/MIXEDCase camelcaseparent
+            lowercaseparent/lowercase => CamelCaseParent/lowercase
+            lowercaseparent/mixedCase => CamelCaseParent/mixedCase
+            """)
 
 
 class TestMisc(TestCICPBase):
@@ -222,15 +245,14 @@
     def test_status(self):
         wt = self._make_mixed_case_tree()
         self.run_bzr('add')
-
-        self.check_output(
-            """added:
-  CamelCaseParent/
-  CamelCaseParent/CamelCase
-  lowercaseparent/
-  lowercaseparent/lowercase
-""",
-            'status camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE')
+        run_script(self, """
+            $ bzr status camelcaseparent/camelcase LOWERCASEPARENT/LOWERCASE
+            added:
+              CamelCaseParent/
+              CamelCaseParent/CamelCase
+              lowercaseparent/
+              lowercaseparent/lowercase
+            """)
 
     def test_ci(self):
         wt = self._make_mixed_case_tree()

=== modified file 'bzrlib/tests/blackbox/test_find_merge_base.py'
--- bzrlib/tests/blackbox/test_find_merge_base.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_find_merge_base.py	2010-06-15 06:35:41 +0000
@@ -16,10 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 import os
 
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestFindMergeBase(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestFindMergeBase(TestCaseWithTransport):
 
     def test_find_merge_base(self):
         a_tree = self.make_branch_and_tree('a')

=== modified file 'bzrlib/tests/blackbox/test_help.py'
--- bzrlib/tests/blackbox/test_help.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/blackbox/test_help.py	2010-06-15 06:35:41 +0000
@@ -20,11 +20,11 @@
 
 
 import bzrlib
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
-class TestHelp(ExternalBase):
+class TestHelp(TestCaseWithTransport):
 
     def test_help_basic(self):
         for cmd in ['--help', 'help', '-h', '-?']:

=== modified file 'bzrlib/tests/blackbox/test_ignore.py'
--- bzrlib/tests/blackbox/test_ignore.py	2010-05-03 09:19:15 +0000
+++ bzrlib/tests/blackbox/test_ignore.py	2010-06-15 06:35:41 +0000
@@ -34,11 +34,11 @@
     pathjoin,
     )
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 
 
-class TestCommands(ExternalBase):
+class TestCommands(TestCaseWithTransport):
 
     def test_ignore_absolutes(self):
         """'ignore' with an absolute path returns an error"""

=== modified file 'bzrlib/tests/blackbox/test_ignored.py'
--- bzrlib/tests/blackbox/test_ignored.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_ignored.py	2010-06-15 06:35:41 +0000
@@ -17,10 +17,10 @@
 
 """Tests of the 'bzr ignored' command."""
 
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestIgnored(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestIgnored(TestCaseWithTransport):
 
     def test_ignored_added_file(self):
         """'bzr ignored' should not list versioned files."""

=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- bzrlib/tests/blackbox/test_init.py	2010-05-05 14:02:53 +0000
+++ bzrlib/tests/blackbox/test_init.py	2010-06-15 06:35:41 +0000
@@ -27,15 +27,15 @@
     )
 from bzrlib.bzrdir import BzrDirMetaFormat1
 from bzrlib.tests import TestSkipped
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 from bzrlib.workingtree import WorkingTree
 
 
-class TestInit(ExternalBase):
+class TestInit(TestCaseWithTransport):
 
     def setUp(self):
-        ExternalBase.setUp(self)
+        TestCaseWithTransport.setUp(self)
         self._default_label = '2a'
 
     def test_init_with_format(self):

=== modified file 'bzrlib/tests/blackbox/test_modified.py'
--- bzrlib/tests/blackbox/test_modified.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_modified.py	2010-06-15 06:35:41 +0000
@@ -21,9 +21,9 @@
 import os
 
 from bzrlib.branch import Branch
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 
-class TestModified(ExternalBase):
+class TestModified(TestCaseWithTransport):
 
     def test_modified(self):
         """Test that 'modified' command reports modified files"""

=== modified file 'bzrlib/tests/blackbox/test_nick.py'
--- bzrlib/tests/blackbox/test_nick.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_nick.py	2010-06-15 06:35:41 +0000
@@ -20,10 +20,10 @@
 
 import bzrlib
 from bzrlib import osutils
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestNick(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestNick(TestCaseWithTransport):
 
     def test_nick_command(self):
         """bzr nick for viewing, setting nicknames"""

=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- bzrlib/tests/blackbox/test_pull.py	2010-02-23 07:43:11 +0000
+++ bzrlib/tests/blackbox/test_pull.py	2010-06-15 06:35:41 +0000
@@ -29,12 +29,12 @@
 from bzrlib.branch import Branch
 from bzrlib.directory_service import directories
 from bzrlib.osutils import pathjoin
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.uncommit import uncommit
 from bzrlib.workingtree import WorkingTree
 
 
-class TestPull(ExternalBase):
+class TestPull(TestCaseWithTransport):
 
     def example_branch(self, path='.'):
         tree = self.make_branch_and_tree(path)

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2010-04-28 10:30:48 +0000
+++ bzrlib/tests/blackbox/test_push.py	2010-06-15 06:35:41 +0000
@@ -788,7 +788,7 @@
         self.assertPushSucceeds([])
 
 
-class TestPushForeign(blackbox.ExternalBase):
+class TestPushForeign(tests.TestCaseWithTransport):
 
     def setUp(self):
         super(TestPushForeign, self).setUp()

=== modified file 'bzrlib/tests/blackbox/test_remerge.py'
--- bzrlib/tests/blackbox/test_remerge.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/blackbox/test_remerge.py	2010-06-15 06:35:41 +0000
@@ -17,11 +17,11 @@
 
 import os
 
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 
 
-class TestRemerge(ExternalBase):
+class TestRemerge(TestCaseWithTransport):
 
     def make_file(self, name, contents):
         f = open(name, 'wb')

=== modified file 'bzrlib/tests/blackbox/test_remove.py'
--- bzrlib/tests/blackbox/test_remove.py	2009-09-07 08:52:04 +0000
+++ bzrlib/tests/blackbox/test_remove.py	2010-06-15 06:35:41 +0000
@@ -19,7 +19,7 @@
 import sys
 
 from bzrlib.tests import SymlinkFeature, TestSkipped
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 from bzrlib import osutils
 
@@ -31,7 +31,7 @@
 files=(a, b, c, d)
 
 
-class TestRemove(ExternalBase):
+class TestRemove(TestCaseWithTransport):
 
     def _make_tree_and_add(self, paths):
         tree = self.make_branch_and_tree('.')

=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py'
--- bzrlib/tests/blackbox/test_remove_tree.py	2010-05-28 06:04:57 +0000
+++ bzrlib/tests/blackbox/test_remove_tree.py	2010-06-15 06:35:41 +0000
@@ -20,10 +20,10 @@
 import os
 
 from bzrlib import shelf
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestRemoveTree(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestRemoveTree(TestCaseWithTransport):
 
     def setUp(self):
         super(TestRemoveTree, self).setUp()

=== modified file 'bzrlib/tests/blackbox/test_revert.py'
--- bzrlib/tests/blackbox/test_revert.py	2009-08-28 05:00:33 +0000
+++ bzrlib/tests/blackbox/test_revert.py	2010-06-15 06:35:41 +0000
@@ -19,12 +19,12 @@
 import os
 
 import bzrlib.osutils
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
 
-class TestRevert(ExternalBase):
+class TestRevert(TestCaseWithTransport):
 
     def _prepare_tree(self):
         self.run_bzr('init')

=== modified file 'bzrlib/tests/blackbox/test_revision_info.py'
--- bzrlib/tests/blackbox/test_revision_info.py	2009-06-30 16:59:21 +0000
+++ bzrlib/tests/blackbox/test_revision_info.py	2010-06-15 06:35:41 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2009 Canonical Ltd
+# Copyright (C) 2004, 2005, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,19 +17,19 @@
 import os
 
 from bzrlib.errors import BzrCommandError, NoSuchRevision
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 
 
-class TestRevisionInfo(ExternalBase):
+class TestRevisionInfo(TestCaseWithTransport):
 
-    def check_error(self, output, *args):
-        """Verify that the expected error matches what bzr says.
+    def check_output(self, output, *args):
+        """Verify that the expected output matches what bzr says.
 
         The output is supplied first, so that you can supply a variable
         number of arguments to bzr.
         """
-        self.assertContainsRe(self.run_bzr(args, retcode=3)[1], output)
+        self.assertEquals(self.run_bzr(*args)[0], output)
 
     def test_revision_info(self):
         """Test that 'bzr revision-info' reports the correct thing."""

=== modified file 'bzrlib/tests/blackbox/test_rmbranch.py'
--- bzrlib/tests/blackbox/test_rmbranch.py	2010-03-22 10:11:00 +0000
+++ bzrlib/tests/blackbox/test_rmbranch.py	2010-06-15 06:35:41 +0000
@@ -20,12 +20,12 @@
 from bzrlib import (
     bzrdir,
     )
-from bzrlib.tests.blackbox import (
-    ExternalBase,
+from bzrlib.tests import (
+    TestCaseWithTransport,
     )
 
 
-class TestRemoveBranch(ExternalBase):
+class TestRemoveBranch(TestCaseWithTransport):
 
     def example_branch(self, path='.'):
         tree = self.make_branch_and_tree(path)

=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- bzrlib/tests/blackbox/test_switch.py	2010-05-28 14:15:28 +0000
+++ bzrlib/tests/blackbox/test_switch.py	2010-06-15 06:35:41 +0000
@@ -22,11 +22,11 @@
 
 from bzrlib import osutils
 from bzrlib.workingtree import WorkingTree
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.directory_service import directories
 
 
-class TestSwitch(ExternalBase):
+class TestSwitch(TestCaseWithTransport):
 
     def _create_sample_tree(self):
         tree = self.make_branch_and_tree('branch-1')

=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- bzrlib/tests/blackbox/test_too_much.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/blackbox/test_too_much.py	2010-06-15 06:35:41 +0000
@@ -46,11 +46,11 @@
 from bzrlib.errors import BzrCommandError
 from bzrlib.tests.http_utils import TestCaseWithWebserver
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 
 
-class TestCommands(ExternalBase):
+class TestCommands(TestCaseWithTransport):
 
     def test_invalid_commands(self):
         self.run_bzr("pants", retcode=3)
@@ -354,7 +354,7 @@
     return L
 
 
-class OldTests(ExternalBase):
+class OldTests(TestCaseWithTransport):
     """old tests moved from ./testbzr."""
 
     def test_bzr(self):

=== modified file 'bzrlib/tests/blackbox/test_unknowns.py'
--- bzrlib/tests/blackbox/test_unknowns.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_unknowns.py	2010-06-15 06:35:41 +0000
@@ -18,10 +18,10 @@
 
 """Black-box tests for 'bzr unknowns', which shows unknown files."""
 
-from bzrlib.tests.blackbox import ExternalBase
-
-
-class TestUnknowns(ExternalBase):
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestUnknowns(TestCaseWithTransport):
 
     def test_unknowns(self):
         """Test that 'unknown' command reports unknown files"""

=== modified file 'bzrlib/tests/blackbox/test_whoami.py'
--- bzrlib/tests/blackbox/test_whoami.py	2010-06-07 01:16:10 +0000
+++ bzrlib/tests/blackbox/test_whoami.py	2010-06-15 06:35:41 +0000
@@ -20,6 +20,7 @@
 import os
 
 import bzrlib
+<<<<<<< TREE
 from bzrlib import (
     osutils,
     config,
@@ -28,6 +29,14 @@
 
 
 class TestWhoami(ExternalBase):
+=======
+from bzrlib import osutils
+from bzrlib.branch import Branch
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestWhoami(TestCaseWithTransport):
+>>>>>>> MERGE-SOURCE
 
     def test_whoami(self):
         # this should always identify something, if only "john@localhost"