← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/test_baz_import.py

  • Committer: Robert Collins
  • Date: 2005-09-08 11:21:38 UTC
  • mto: (147.2.6) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20050908112138-033369d3cacacb55
test and deliver basic pending-merges into bzr so that merging is recorded

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_baz_import.py
47
47
        msg = tree.log_message()
48
48
        msg["summary"] = "I am importing now"
49
49
        tree.import_(msg)
 
50
 
50
51
        self._empty_tag = 'demo@DONOTUSE/c--empty-tag--0'
51
52
        self._empty_tag_bzr = revision_id(self._empty_tag + '--base-0')
52
53
        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
53
 
            pybaz.Version('demo@DONOTUSE/c--empty-tag--0'))
 
54
            pybaz.Version(self._empty_tag))
 
55
 
 
56
        self._empty_merged_tag = 'demo@DONOTUSE/c--empty-merged-tag--0'
 
57
        self._empty_merged_tag_bzr_base = revision_id(self._empty_merged_tag 
 
58
                                                 + '--base-0')
 
59
        self._empty_merged_tag_bzr = revision_id(self._empty_merged_tag 
 
60
                                                 + '--patch-1')
 
61
        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(
 
62
            pybaz.Version(self._empty_merged_tag))
 
63
        tree = pybaz.Revision(self._empty_merged_tag + '--base-0').get(
 
64
            'tree-empty-merged')
 
65
        tree.star_merge(self._empty_tag,
 
66
                        pybaz.Version('demo@DONOTUSE/c--import--0'))
 
67
        msg = tree.log_message()
 
68
        msg["summary"]="did a merge, yarh"
 
69
        tree.commit(msg)
54
70
 
55
71
    def tearDown(self):
56
72
        os.environ['HOME'] = self._oldhome
101
117
        self.assertEqual(rev.message, "tag of demo@DONOTUSE/c--import--0--base-0")
102
118
        self.assertEqual(rev.revision_id, self._empty_tag_bzr)
103
119
 
 
120
    def test_empty_merged_tagged(self):
 
121
        import_version('output', pybaz.Version(self._empty_merged_tag))
 
122
        # expected results:
 
123
        # two commits, no files, revision identifiers of 
 
124
        # 'demo@DONOTUSE_c--import--0--base-0' and
 
125
        # self._empty_merged_tag_bzr_base
 
126
        # self._empty_merged_tag_bzr
 
127
        # and a merged revision from the latter of
 
128
        # self._empty_tag_bzr
 
129
        branch = find_branch('output', find_root=False)
 
130
        self.assertEqual(branch.revision_history(),
 
131
                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',
 
132
                          self._empty_merged_tag_bzr_base,
 
133
                          self._empty_merged_tag_bzr])
 
134
        # and again.
 
135
        import_version('output2', pybaz.Version(self._empty_merged_tag))
 
136
        branch2 = find_branch('output2', find_root=False)
 
137
        # and import what we should be merged up against for checking with.
 
138
        import_version('output3', pybaz.Version(self._empty_tag))
 
139
        branch3 = find_branch('output3', find_root=False)
 
140
        
 
141
        self.assertEqual(branch.revision_history(), branch2.revision_history())
 
142
        self.assertNotEqual(branch.revision_history(), branch3.revision_history())
 
143
        # check revisions in the history.
 
144
        rev = branch.get_revision(self._empty_merged_tag_bzr_base)
 
145
        rev2 = branch2.get_revision(self._empty_merged_tag_bzr_base)
 
146
        # they must be the same
 
147
        self.assertEqual(rev, rev2)
 
148
        # and we should get some expected values:
 
149
        self.assertEqual(rev.committer, "Test User<test@example.org>")
 
150
        self.assertEqual(rev.message, "tag of demo@DONOTUSE/c--import--0--base-0")
 
151
        self.assertEqual(rev.revision_id, self._empty_merged_tag_bzr_base)
 
152
 
 
153
        # check next revisions in the history.
 
154
        rev = branch.get_revision(self._empty_merged_tag_bzr)
 
155
        rev2 = branch2.get_revision(self._empty_merged_tag_bzr)
 
156
        # they must be the same
 
157
        self.assertEqual(rev, rev2)
 
158
        # and we should get some expected values:
 
159
        self.assertEqual(rev.committer, "Test User<test@example.org>")
 
160
        self.assertEqual(rev.message, "did a merge, yarh")
 
161
        self.assertEqual(rev.revision_id, self._empty_merged_tag_bzr)
 
162
        self.assertEqual(rev.parents[0].revision_id,
 
163
                         self._empty_merged_tag_bzr_base)
 
164
        self.assertEqual(rev.parents[1].revision_id,
 
165
                         self._empty_tag_bzr)
 
166
 
 
167
        # this tree should have nothing missing from that tree.   
 
168
        # FIXME there is no code for this right now.
 
169
        # self.assertEqual(branch.missing_revisions(branch3), [])