← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 04:54:00 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405045400-7b57a53ee7fdaab6
Moved and renamed conflict functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
67
67
 
68
68
class TestConflictStanzas(TestCase):
69
69
    def test_stanza_roundtrip(self):
70
 
        processed = list(stanza_conflicts(conflict_stanzas(example_conflicts)))
 
70
        stanza_iter = conflicts_to_stanzas(example_conflicts)
 
71
        processed = list(stanzas_to_conflicts(stanza_iter))
71
72
        for o,p in zip(processed, example_conflicts):
72
73
            self.assertEqual(o, p)
73
74
 
74
75
    def test_stanzification(self):
75
 
        for stanza in conflict_stanzas(example_conflicts):
 
76
        for stanza in conflicts_to_stanzas(example_conflicts):
76
77
            try:
77
78
                self.assertStartsWith(stanza['file_id'], 'id')
78
79
            except KeyError: