Rev 2609: Update tests for new version display in http://sourcefrog.net/bzr/test-cleanup

[Martin Pool]

At http://sourcefrog.net/bzr/test-cleanup

------------------------------------------------------------
revno: 2609
revision-id: mbp at sourcefrog.net-20070713030711-jojiwbrtcgybfdyp
parent: mbp at sourcefrog.net-20070713013719-x6j1ha53ymowniri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Fri 2007-07-13 13:07:11 +1000
message:
  Update tests for new version display
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-07-12 10:12:50 +0000
+++ b/bzrlib/builtins.py	2007-07-13 03:07:11 +0000
@@ -2480,7 +2480,8 @@
 
         if cache_dir is not None:
             tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
-        show_version(show_config=False, show_copyright=False)
+        if not list_only:
+            show_version(show_config=False, show_copyright=False)
         print
         if testspecs_list is not None:
             pattern = '|'.join(testspecs_list)

=== modified file 'bzrlib/tests/blackbox/test_version.py'
--- a/bzrlib/tests/blackbox/test_version.py	2007-07-02 05:24:07 +0000
+++ b/bzrlib/tests/blackbox/test_version.py	2007-07-13 03:07:11 +0000
@@ -26,8 +26,8 @@
         out = self.run_bzr("version")[0]
         self.assertTrue(len(out) > 0)
         self.assertEquals(1, out.count(bzrlib.__version__))
-        self.assertEquals(1, out.count("Using Python interpreter:"))
-        self.assertEquals(1, out.count("Using Python standard library:"))
-        self.assertEquals(1, out.count("Using bzrlib:"))
-        self.assertEquals(1, out.count("Using Bazaar configuration:"))
-        self.assertContainsRe(out, r'(?m)^Using Bazaar log file:.*bzr\.log')
+        self.assertContainsRe(out, r"(?m)^    Python interpreter:")
+        self.assertContainsRe(out, r"(?m)^    Python standard library:")
+        self.assertContainsRe(out, r"(?m)^    bzrlib:")
+        self.assertContainsRe(out, r"(?m)^    Bazaar configuration:")
+        self.assertContainsRe(out, r'(?m)^    Bazaar log file:.*bzr\.log')