Rev 4615: Remove spurious change. in file:///home/vila/src/bzr/experimental/conflict-manager/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Jan 4 14:57:00 GMT 2010
At file:///home/vila/src/bzr/experimental/conflict-manager/
------------------------------------------------------------
revno: 4615
revision-id: v.ladeuil+lp at free.fr-20100104145659-hl76lelnfhicyhjy
parent: v.ladeuil+lp at free.fr-20100104143322-umzmc7r7uusohw4s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Mon 2010-01-04 15:56:59 +0100
message:
Remove spurious change.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py 2009-12-10 17:03:48 +0000
+++ b/bzrlib/tests/test_conflicts.py 2010-01-04 14:56:59 +0000
@@ -53,40 +53,6 @@
])
-class TestConflictStanzas(tests.TestCase):
-
- def test_stanza_roundtrip(self):
- # write and read our example stanza.
- stanza_iter = example_conflicts.to_stanzas()
- processed = conflicts.ConflictList.from_stanzas(stanza_iter)
- for o, p in zip(processed, example_conflicts):
- self.assertEqual(o, p)
-
- self.assertIsInstance(o.path, unicode)
-
- if o.file_id is not None:
- self.assertIsInstance(o.file_id, str)
-
- conflict_path = getattr(o, 'conflict_path', None)
- if conflict_path is not None:
- self.assertIsInstance(conflict_path, unicode)
-
- conflict_file_id = getattr(o, 'conflict_file_id', None)
- if conflict_file_id is not None:
- self.assertIsInstance(conflict_file_id, str)
-
- def test_stanzification(self):
- for stanza in example_conflicts.to_stanzas():
- if 'file_id' in stanza:
- # In Stanza form, the file_id has to be unicode.
- self.assertStartsWith(stanza['file_id'], u'\xeed')
- self.assertStartsWith(stanza['path'], u'p\xe5th')
- if 'conflict_path' in stanza:
- self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
- if 'conflict_file_id' in stanza:
- self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
-
-
class TestConflicts(tests.TestCaseWithTransport):
def test_conflicts(self):
@@ -172,3 +138,36 @@
self.assertEqual(conflicts.ConflictList([]), tree.conflicts())
+class TestConflictStanzas(tests.TestCase):
+
+ def test_stanza_roundtrip(self):
+ # write and read our example stanza.
+ stanza_iter = example_conflicts.to_stanzas()
+ processed = conflicts.ConflictList.from_stanzas(stanza_iter)
+ for o, p in zip(processed, example_conflicts):
+ self.assertEqual(o, p)
+
+ self.assertIsInstance(o.path, unicode)
+
+ if o.file_id is not None:
+ self.assertIsInstance(o.file_id, str)
+
+ conflict_path = getattr(o, 'conflict_path', None)
+ if conflict_path is not None:
+ self.assertIsInstance(conflict_path, unicode)
+
+ conflict_file_id = getattr(o, 'conflict_file_id', None)
+ if conflict_file_id is not None:
+ self.assertIsInstance(conflict_file_id, str)
+
+ def test_stanzification(self):
+ for stanza in example_conflicts.to_stanzas():
+ if 'file_id' in stanza:
+ # In Stanza form, the file_id has to be unicode.
+ self.assertStartsWith(stanza['file_id'], u'\xeed')
+ self.assertStartsWith(stanza['path'], u'p\xe5th')
+ if 'conflict_path' in stanza:
+ self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
+ if 'conflict_file_id' in stanza:
+ self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
+
More information about the bazaar-commits
mailing list