Rev 4601: (robertc) Prepare blackbox.init tests for using 2a as a default in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4601 [merge]
revision-id: pqm at pqm.ubuntu.com-20090813014831-e0k1cmstvkhdre6e
parent: pqm at pqm.ubuntu.com-20090812222828-fdlyshwsomwvfaf2
parent: robertc at robertcollins.net-20090812215832-evy6rs7n4cyljq44
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-08-13 02:48:31 +0100
message:
  (robertc) Prepare blackbox.init tests for using 2a as a default
  	format. (Robert Collins)
modified:
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py	2009-06-11 04:04:14 +0000
+++ b/bzrlib/tests/blackbox/test_init.py	2009-08-12 21:58:32 +0000
@@ -33,6 +33,10 @@
 
 class TestInit(ExternalBase):
 
+    def setUp(self):
+        ExternalBase.setUp(self)
+        self._default_label = 'pack-0.92'
+
     def test_init_with_format(self):
         # Verify bzr init --format constructs something plausible
         t = self.get_transport()
@@ -66,10 +70,10 @@
         repo = newdir.create_repository(shared=True)
         repo.set_make_working_trees(False)
         out, err = self.run_bzr('init repo')
-        self.assertEqual("""Created a repository tree (format: pack-0.92)
+        self.assertEqual("""Created a repository tree (format: %s)
 Using shared repository: %s
-""" % urlutils.local_path_from_url(
-            repo.bzrdir.root_transport.external_url()), out)
+""" % (self._default_label, urlutils.local_path_from_url(
+            repo.bzrdir.root_transport.external_url())), out)
         self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
             "test_init_at_repository_root/work/repo/\n")
         self.assertEqual('', err)
@@ -78,14 +82,14 @@
 
     def test_init_branch(self):
         out, err = self.run_bzr('init')
-        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
-            out)
+        self.assertEqual("Created a standalone tree (format: %s)\n" % (
+            self._default_label,), out)
         self.assertEqual('', err)
 
         # Can it handle subdirectories of branches too ?
         out, err = self.run_bzr('init subdir1')
-        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
-            out)
+        self.assertEqual("Created a standalone tree (format: %s)\n" % (
+            self._default_label,), out)
         self.assertEqual('', err)
         WorkingTree.open('subdir1')
 
@@ -96,8 +100,8 @@
 
         os.mkdir('subdir2')
         out, err = self.run_bzr('init subdir2')
-        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
-            out)
+        self.assertEqual("Created a standalone tree (format: %s)\n" % (
+            self._default_label,), out)
         self.assertEqual('', err)
         # init an existing branch.
         out, err = self.run_bzr('init subdir2', retcode=3)
@@ -163,7 +167,7 @@
 
     def test_init(self):
         # init on a remote url should succeed.
-        out, err = self.run_bzr(['init', self.get_url()])
+        out, err = self.run_bzr(['init', '--pack-0.92', self.get_url()])
         self.assertEqual(out,
             """Created a standalone branch (format: pack-0.92)\n""")
         self.assertEqual('', err)