Rev 4722: Some test cleamup. in file:///home/vila/src/bzr/bugs/438158-dpush-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/438158-dpush-strict/

------------------------------------------------------------
revno: 4722
revision-id: v.ladeuil+lp at free.fr-20091002072429-9662j2l401jz5vch
parent: pqm at pqm.ubuntu.com-20091001072307-u01ny02917u8mmfg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 438158-dpush-strict
timestamp: Fri 2009-10-02 09:24:29 +0200
message:
  Some test cleamup.
  
  * bzrlib/tests/blackbox/test_send.py:
  Fix typos.
  
  * bzrlib/tests/blackbox/test_dpush.py: 
  Fix imports.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_dpush.py'
--- a/bzrlib/tests/blackbox/test_dpush.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/blackbox/test_dpush.py	2009-10-02 07:24:29 +0000
@@ -20,48 +20,44 @@
 
 import os
 
-from bzrlib.branch import (
-    Branch,
-    InterBranch,
-    )
-from bzrlib.bzrdir import (
-    BzrDirFormat,
-    )
-from bzrlib.foreign import (
-    ForeignBranch,
-    ForeignRepository,
-    )
-from bzrlib.repository import (
-    Repository,
-    )
-from bzrlib.tests.blackbox import (
-    ExternalBase,
+from bzrlib import (
+    branch,
+    bzrdir,
+    foreign,
+    tests,
     )
 from bzrlib.tests.test_foreign import (
     DummyForeignVcsDirFormat,
     InterToDummyVcsBranch,
     )
-
-
-class TestDpush(ExternalBase):
+from bzrlib.tests import (
+    blackbox,
+    test_foreign,
+    )
+
+class TestDpush(blackbox.ExternalBase):
 
     def setUp(self):
-        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
-        InterBranch.register_optimiser(InterToDummyVcsBranch)
+        bzrdir.BzrDirFormat.register_control_format(
+            test_foreign.DummyForeignVcsDirFormat)
+        branch.InterBranch.register_optimiser(
+            test_foreign.InterToDummyVcsBranch)
         self.addCleanup(self.unregister_format)
         super(TestDpush, self).setUp()
 
     def unregister_format(self):
         try:
-            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
+            bzrdir.BzrDirFormat.unregister_control_format(
+                test_foreign.DummyForeignVcsDirFormat)
         except ValueError:
             pass
-        InterBranch.unregister_optimiser(InterToDummyVcsBranch)
+        branch.InterBranch.unregister_optimiser(
+            test_foreign.InterToDummyVcsBranch)
 
     def make_dummy_builder(self, relpath):
-        builder = self.make_branch_builder(relpath, 
-                format=DummyForeignVcsDirFormat())
-        builder.build_snapshot('revid', None, 
+        builder = self.make_branch_builder(
+            relpath, format=test_foreign.DummyForeignVcsDirFormat())
+        builder.build_snapshot('revid', None,
             [('add', ('', 'TREE_ROOT', 'directory', None)),
              ('add', ('foo', 'fooid', 'file', 'bar'))])
         return builder
@@ -85,9 +81,9 @@
         self.check_output("", "status dc")
 
     def test_dpush_new(self):
-        branch = self.make_dummy_builder('d').get_branch()
+        b = self.make_dummy_builder('d').get_branch()
 
-        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
+        dc = b.bzrdir.sprout('dc', force_new_repo=True)
         self.build_tree_contents([("dc/foofile", "blaaaa")])
         dc_tree = dc.open_workingtree()
         dc_tree.add("foofile")
@@ -98,9 +94,9 @@
         self.check_output("", "status dc")
 
     def test_dpush_wt_diff(self):
-        branch = self.make_dummy_builder('d').get_branch()
+        b = self.make_dummy_builder('d').get_branch()
 
-        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
+        dc = b.bzrdir.sprout('dc', force_new_repo=True)
         self.build_tree_contents([("dc/foofile", "blaaaa")])
         dc_tree = dc.open_workingtree()
         dc_tree.add("foofile")
@@ -114,9 +110,9 @@
     def test_diverged(self):
         builder = self.make_dummy_builder('d')
 
-        branch = builder.get_branch()
+        b = builder.get_branch()
 
-        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
+        dc = b.bzrdir.sprout('dc', force_new_repo=True)
         dc_tree = dc.open_workingtree()
 
         self.build_tree_contents([("dc/foo", "bar")])

=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2009-09-17 11:54:41 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2009-10-02 07:24:29 +0000
@@ -423,7 +423,7 @@
         self.assertSendFails([])
         self.assertSendSucceeds(['--no-strict'])
 
-    def test_push_strict_command_line_override_config(self):
+    def test_send_strict_command_line_override_config(self):
         self.set_config_send_strict('false')
         self.assertSendSucceeds([])
         self.assertSendFails(['--strict'])