Rev 4672: Start rewriting shell-like conflict tests into whitebox tests. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4672
revision-id: v.ladeuil+lp at free.fr-20100205104333-pdgq0r2ujafy1tpx
parent: v.ladeuil+lp at free.fr-20100205102733-8wpjnqz6g4nvrbfu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: dont-add-conflict-helpers
timestamp: Fri 2010-02-05 11:43:33 +0100
message:
  Start rewriting shell-like conflict tests into whitebox tests.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-02-02 12:52:13 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-02-05 10:43:33 +0000
@@ -174,22 +174,25 @@
                 self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
 
 
+# FIXME: The shell-like tests should be converted to real whitebox tests... or
+# moved to a blackbox module -- vila 20100205
+
 # FIXME: Tests missing for DuplicateID conflict type
-class TestResolveConflicts(script.TestCaseWithTransportAndScript):
+class OldTestResolveConflicts(script.TestCaseWithTransportAndScript):
 
     preamble = None # The setup script set by daughter classes
 
     def setUp(self):
-        super(TestResolveConflicts, self).setUp()
+        super(OldTestResolveConflicts, self).setUp()
         self.run_script(self.preamble)
 
 
-class TestResolveTextConflicts(TestResolveConflicts):
+class TestResolveTextConflicts(OldTestResolveConflicts):
     # TBC
     pass
 
 
-class TestResolveContentConflicts(TestResolveConflicts):
+class TestResolveContentConflicts(OldTestResolveConflicts):
 
     # FIXME: We need to add the reverse case (delete in trunk, modify in
     # branch) but that could wait until the resolution mechanism is implemented.
@@ -244,7 +247,7 @@
 """)
 
 
-class TestResolveDuplicateEntry(TestResolveConflicts):
+class TestResolveDuplicateEntry(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -299,7 +302,7 @@
 """)
 
 
-class TestResolveUnversionedParent(TestResolveConflicts):
+class TestResolveUnversionedParent(OldTestResolveConflicts):
 
     # FIXME: Add the reverse tests: dir deleted in trunk, file added in branch
 
@@ -342,7 +345,7 @@
 """)
 
 
-class TestResolveMissingParent(TestResolveConflicts):
+class TestResolveMissingParent(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -403,7 +406,7 @@
 """)
 
 
-class TestResolveDeletingParent(TestResolveConflicts):
+class TestResolveDeletingParent(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -463,7 +466,7 @@
 """)
 
 
-class TestResolvePathConflict(TestResolveConflicts):
+class TestResolvePathConflict(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -511,7 +514,7 @@
 """)
 
 
-class TestResolveParentLoop(TestResolveConflicts):
+class TestResolveParentLoop(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -561,7 +564,7 @@
         self.failUnlessExists('dir1')
 
 
-class TestResolveNonDirectoryParent(TestResolveConflicts):
+class TestResolveNonDirectoryParent(OldTestResolveConflicts):
 
     preamble = """
 $ bzr init trunk