/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_model.py

Use the builder in test_model as well to shave off a few more seconds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_model.py
36
36
 
37
37
    def test_ancestors(self):
38
38
        tests.run_git('init')
39
 
        self.build_tree(['a'])
40
 
        tests.run_git('add', 'a')
41
 
        tests.run_git('commit', '-m', 'a')
42
 
        tests.run_git('branch', 'foo')
43
 
        self.build_tree_contents([('a', 'new a\n')])
44
 
        tests.run_git('commit', '-a', '-m', 'new a')
45
 
        tests.run_git('checkout', 'foo')
46
 
        self.build_tree(['b'])
47
 
        tests.run_git('add', 'b')
48
 
        tests.run_git('commit', '-m', 'b')
49
 
        tests.run_git('merge', 'master')
50
 
 
51
 
        revisions = tests.run_git('rev-list', '--topo-order', 'HEAD')
 
39
        builder = tests.GitBranchBuilder()
 
40
        file_handle = builder.set_file('a', 'text for a\n', False)
 
41
        commit1_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
42
        file2_handle = builder.set_file('a', 'new a\n', False)
 
43
        commit2_handle = builder.commit('Joe Foo <joe@foo.com>', u'new a')
 
44
        file3_handle = builder.set_file('b', 'text for b\n', False)
 
45
        commit3_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'b',
 
46
                                        base=commit1_handle)
 
47
        commit4_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'merge',
 
48
                                        base=commit3_handle,
 
49
                                        merge=[commit2_handle],)
 
50
 
 
51
        mapping = builder.finish()
 
52
        commit1_id = mapping[commit1_handle]
 
53
        commit2_id = mapping[commit2_handle]
 
54
        commit3_id = mapping[commit3_handle]
 
55
        commit4_id = mapping[commit4_handle]
 
56
 
 
57
        revisions = tests.run_git('rev-list', '--topo-order',
 
58
                                  commit4_id)
52
59
        revisions = revisions.splitlines()
 
60
        self.assertEqual([commit4_id, commit2_id, commit3_id, commit1_id],
 
61
                         revisions)
 
62
 
53
63
        graph = {revisions[0]:[revisions[2], revisions[1]],
54
64
                 revisions[1]:[revisions[3]],
55
65
                 revisions[2]:[revisions[3]],
57
67
                }
58
68
 
59
69
        themodel = model.GitModel('.git')
 
70
        tests.run_git('reset', '--hard', commit4_id)
60
71
        self.assertEqual(revisions[0], themodel.get_head())
61
72
        self.assertEqual(graph, themodel.ancestry([revisions[0]]))