← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testfetch.py

  • Committer: Robert Collins
  • Date: 2005-09-29 02:01:49 UTC
  • Revision ID: robertc@robertcollins.net-20050929020149-1ff16722c6a01b2c
reenable remotebranch tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testfetch.py
33
33
    except bzrlib.errors.NoSuchRevision:
34
34
        return False
35
35
 
 
36
def fetch_steps(self, br_a, br_b, writable_a):
 
37
    """A foreign test method for testing fetch locally and remotely."""
 
38
    def new_branch(name):
 
39
        os.mkdir(name)
 
40
        return Branch.initialize(name)
 
41
            
 
42
    assert not has_revision(br_b, br_a.revision_history()[3])
 
43
    assert has_revision(br_b, br_a.revision_history()[2])
 
44
    assert len(br_b.revision_history()) == 7
 
45
    assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
 
46
 
 
47
    # greedy_fetch is not supposed to alter the revision history
 
48
    assert len(br_b.revision_history()) == 7
 
49
    assert not has_revision(br_b, br_a.revision_history()[3])
 
50
 
 
51
    assert len(br_b.revision_history()) == 7
 
52
    assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
 
53
    assert has_revision(br_b, br_a.revision_history()[3])
 
54
    assert not has_revision(br_a, br_b.revision_history()[6])
 
55
    assert has_revision(br_a, br_b.revision_history()[5])
 
56
 
 
57
    # When a non-branch ancestor is missing, it should be a failure, not
 
58
    # exception
 
59
    print ("CANNOT TEST MISSING NON REVISION_HISTORY ANCESTORS WITHOUT"
 
60
           " GHOSTS")
 
61
#    br_a4 = new_branch('br_a4')
 
62
#    count, failures = greedy_fetch(br_a4, br_a)
 
63
#    self.assertEqual(count, 6)
 
64
#    self.assertEqual(failures, set((br_b.revision_history()[4],
 
65
#                                    br_b.revision_history()[5]))) 
 
66
 
 
67
    self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
 
68
    assert has_revision(br_a, br_b.revision_history()[3])
 
69
    assert has_revision(br_a, br_b.revision_history()[4])
 
70
        
 
71
    br_b2 = new_branch('br_b2')
 
72
    assert greedy_fetch(br_b2, br_b)[0] == 7
 
73
    assert has_revision(br_b2, br_b.revision_history()[4])
 
74
    assert has_revision(br_b2, br_a.revision_history()[2])
 
75
    assert not has_revision(br_b2, br_a.revision_history()[3])
 
76
 
 
77
    br_a2 = new_branch('br_a2')
 
78
    assert greedy_fetch(br_a2, br_a)[0] == 9
 
79
    assert has_revision(br_a2, br_b.revision_history()[4])
 
80
    assert has_revision(br_a2, br_a.revision_history()[3])
 
81
    assert has_revision(br_a2, br_a.revision_history()[2])
 
82
 
 
83
    br_a3 = new_branch('br_a3')
 
84
    assert greedy_fetch(br_a3, br_a2)[0] == 0
 
85
    for revno in range(4):
 
86
        assert not has_revision(br_a3, br_a.revision_history()[revno])
 
87
    self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
 
88
    fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
 
89
    assert fetched == 3, "fetched %d instead of 3" % fetched
 
90
    # InstallFailed should be raised if the branch is missing the revision
 
91
    # that was requested.
 
92
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
 
93
                      br_a2, 'pizza')
 
94
    # InstallFailed should be raised if the branch is missing a revision
 
95
    # from its own revision history
 
96
    br_a2.append_revision('a-b-c')
 
97
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
 
98
                      br_a2)
 
99
 
36
100
 
37
101
class TestFetch(TestCaseInTempDir):
38
102
 
39
103
    def test_fetch(self):
40
104
        
41
 
        def new_branch(name):
42
 
            os.mkdir(name)
43
 
            return Branch.initialize(name)
44
 
            
45
105
        #highest indices a: 5, b: 7
46
106
        br_a, br_b = make_branches()
47
 
        assert not has_revision(br_b, br_a.revision_history()[3])
48
 
        assert has_revision(br_b, br_a.revision_history()[2])
49
 
        assert len(br_b.revision_history()) == 7
50
 
        assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
51
 
 
52
 
        # greedy_fetch is not supposed to alter the revision history
53
 
        assert len(br_b.revision_history()) == 7
54
 
        assert not has_revision(br_b, br_a.revision_history()[3])
55
 
 
56
 
        assert len(br_b.revision_history()) == 7
57
 
        assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
58
 
        assert has_revision(br_b, br_a.revision_history()[3])
59
 
        assert not has_revision(br_a, br_b.revision_history()[6])
60
 
        assert has_revision(br_a, br_b.revision_history()[5])
61
 
 
62
 
        # When a non-branch ancestor is missing, it should be a failure, not
63
 
        # exception
64
 
        print ("CANNOT TEST MISSING NON REVISION_HISTORY ANCESTORS WITHOUT"
65
 
               " GHOSTS")
66
 
#        br_a4 = new_branch('br_a4')
67
 
#        count, failures = greedy_fetch(br_a4, br_a)
68
 
#        self.assertEqual(count, 6)
69
 
#        self.assertEqual(failures, set((br_b.revision_history()[4],
70
 
#                                        br_b.revision_history()[5]))) 
71
 
 
72
 
        self.assertEqual(greedy_fetch(br_a, br_b)[0], 1)
73
 
        assert has_revision(br_a, br_b.revision_history()[3])
74
 
        assert has_revision(br_a, br_b.revision_history()[4])
75
 
 
76
 
        br_b2 = new_branch('br_b2')
77
 
        assert greedy_fetch(br_b2, br_b)[0] == 7
78
 
        assert has_revision(br_b2, br_b.revision_history()[4])
79
 
        assert has_revision(br_b2, br_a.revision_history()[2])
80
 
        assert not has_revision(br_b2, br_a.revision_history()[3])
81
 
 
82
 
        br_a2 = new_branch('br_a2')
83
 
        assert greedy_fetch(br_a2, br_a)[0] == 9
84
 
        assert has_revision(br_a2, br_b.revision_history()[4])
85
 
        assert has_revision(br_a2, br_a.revision_history()[3])
86
 
        assert has_revision(br_a2, br_a.revision_history()[2])
87
 
 
88
 
        br_a3 = new_branch('br_a3')
89
 
        assert greedy_fetch(br_a3, br_a2)[0] == 0
90
 
        for revno in range(4):
91
 
            assert not has_revision(br_a3, br_a.revision_history()[revno])
92
 
        self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
93
 
        fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
94
 
        assert fetched == 3, "fetched %d instead of 3" % fetched
95
 
        # InstallFailed should be raised if the branch is missing the revision
96
 
        # that was requested.
97
 
        self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
98
 
                          br_a2, 'pizza')
99
 
        # InstallFailed should be raised if the branch is missing a revision
100
 
        # from its own revision history
101
 
        br_a2.append_revision('a-b-c')
102
 
        self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
103
 
                          br_a2)
 
107
        fetch_steps(self, br_a, br_b, br_a)