← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testremotebranch.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 21:07:17 UTC
  • mfrom: (1393.1.6)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20050929210717-cd73981590f17017
Merged the weave changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testremotebranch.py
22
22
import os
23
23
 
24
24
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
25
 
        
 
25
 
 
26
from bzrlib.selftest.testfetch import fetch_steps
26
27
 
27
28
class TestFetch(TestCaseWithWebserver):
28
29
    def runTest(self):
29
 
        from bzrlib.fetch import greedy_fetch, has_revision
 
30
        from bzrlib.fetch import greedy_fetch
 
31
        from bzrlib.selftest.testfetch import has_revision
30
32
 
31
33
        def new_branch(name):
32
34
            os.mkdir(name)
49
51
        to_unzip_output.close()
50
52
        
51
53
        br_rem = Branch.open(self.get_remote_url(br_a.base))
52
 
        assert not has_revision(br_b, br_rem.revision_history()[3])
53
 
        assert has_revision(br_b, br_rem.revision_history()[2])
54
 
        assert len(br_b.revision_history()) == 7
55
 
        assert greedy_fetch(br_b, br_rem, br_rem.revision_history()[2])[0] == 0
56
 
 
57
 
        # greedy_fetch is not supposed to alter the revision history
58
 
        assert len(br_b.revision_history()) == 7
59
 
        assert not has_revision(br_b, br_rem.revision_history()[3])
60
 
 
61
 
        assert len(br_b.revision_history()) == 7
62
 
        assert greedy_fetch(br_b, br_rem, br_rem.revision_history()[3])[0] == 1
63
 
        assert has_revision(br_b, br_a.revision_history()[3])
64
 
        assert not has_revision(br_rem, br_b.revision_history()[3])
65
 
        assert not has_revision(br_rem, br_b.revision_history()[4])
66
 
 
67
 
        # When a non-branch ancestor is missing, it should be a failure, not
68
 
        # exception
69
 
        br_a4 = new_branch('br_a4')
70
 
        count, failures = greedy_fetch(br_a4, br_rem)
71
 
        assert count == 6
72
 
        assert failures == set((br_b.revision_history()[4],
73
 
                                br_b.revision_history()[5])) 
74
 
 
75
 
        assert greedy_fetch(br_a, br_b)[0] == 4
76
 
        assert has_revision(br_a, br_b.revision_history()[3])
77
 
        assert has_revision(br_a, br_b.revision_history()[4])
78
 
 
79
 
        br_b2 = new_branch('br_b2')
80
 
        assert greedy_fetch(br_b2, br_b)[0] == 7
81
 
        assert has_revision(br_b2, br_b.revision_history()[4])
82
 
        assert has_revision(br_b2, br_a.revision_history()[2])
83
 
        assert not has_revision(br_b2, br_a.revision_history()[3])
84
 
 
85
 
        br_a2 = new_branch('br_a2')
86
 
        assert greedy_fetch(br_a2, br_rem)[0] == 9
87
 
        assert has_revision(br_a2, br_b.revision_history()[4])
88
 
        assert has_revision(br_a2, br_a.revision_history()[3])
89
 
 
90
 
 
91
 
if __name__ == '__main__':
92
 
    import unittest
93
 
    sys.exit(unittest.run_suite(unittest.makeSuite()))
 
54
        fetch_steps(self, br_rem, br_b, br_a)
 
55