← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tag.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tag.py
111
111
        # conflicting merge
112
112
        a.tags.set_tag('tag-2', 'z')
113
113
        conflicts = a.tags.merge_to(b.tags)
114
 
        self.assertEqual(conflicts, [('tag-2', 'z', 'y')])
 
114
        self.assertEqual(list(conflicts), [('tag-2', 'z', 'y')])
115
115
        self.assertEqual('y', b.tags.lookup_tag('tag-2'))
116
116
        # overwrite conflicts
117
117
        conflicts = a.tags.merge_to(b.tags, overwrite=True)
118
 
        self.assertEqual(conflicts, [])
 
118
        self.assertEqual(list(conflicts), [])
119
119
        self.assertEqual('z', b.tags.lookup_tag('tag-2'))
120
120
 
121
121
 
122
122
class TestTagsInCheckouts(TestCaseWithTransport):
 
123
    """Tests for how tags are synchronised between the master and child branch
 
124
    of a checkout.
 
125
    """
123
126
 
124
127
    def test_update_tag_into_checkout(self):
125
128
        # checkouts are directly connected to the tags of their master branch: