/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 bzrlib/tests/test_fetch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-02 08:59:57 UTC
  • mfrom: (4065.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090302085957-qvafywhoynyrgxhb
(robertc) fetch() now returns None. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
53
53
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
54
54
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
55
55
    self.assertEquals(len(br_b.revision_history()), 7)
56
 
    self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
 
56
    br_b.fetch(br_a, br_a.revision_history()[2])
57
57
    # branch.fetch is not supposed to alter the revision history
58
58
    self.assertEquals(len(br_b.revision_history()), 7)
59
59
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
60
60
 
61
61
    # fetching the next revision up in sample data copies one revision
62
 
    self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
 
62
    br_b.fetch(br_a, br_a.revision_history()[3])
63
63
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
64
64
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
65
65
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
67
67
    # When a non-branch ancestor is missing, it should be unlisted...
68
68
    # as its not reference from the inventory weave.
69
69
    br_b4 = self.make_branch('br_4')
70
 
    count, failures = br_b4.fetch(br_b)
71
 
    self.assertEqual(count, 7)
72
 
    self.assertEqual(failures, [])
 
70
    br_b4.fetch(br_b)
73
71
 
74
 
    self.assertEqual(writable_a.fetch(br_b)[0], 1)
 
72
    writable_a.fetch(br_b)
75
73
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
76
74
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
77
75
 
78
76
    br_b2 = self.make_branch('br_b2')
79
 
    self.assertEquals(br_b2.fetch(br_b)[0], 7)
 
77
    br_b2.fetch(br_b)
80
78
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
81
79
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
82
80
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
83
81
 
84
82
    br_a2 = self.make_branch('br_a2')
85
 
    self.assertEquals(br_a2.fetch(br_a)[0], 9)
 
83
    br_a2.fetch(br_a)
86
84
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
87
85
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
88
86
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
90
88
    br_a3 = self.make_branch('br_a3')
91
89
    # pulling a branch with no revisions grabs nothing, regardless of
92
90
    # whats in the inventory.
93
 
    self.assertEquals(br_a3.fetch(br_a2)[0], 0)
 
91
    br_a3.fetch(br_a2)
94
92
    for revno in range(4):
95
93
        self.assertFalse(
96
94
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
97
 
    self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
 
95
    br_a3.fetch(br_a2, br_a.revision_history()[2])
98
96
    # pull the 3 revisions introduced by a@u-0-3
99
 
    fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
100
 
    self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
 
97
    br_a3.fetch(br_a2, br_a.revision_history()[3])
101
98
    # InstallFailed should be raised if the branch is missing the revision
102
99
    # that was requested.
103
100
    self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
122
119
 
123
120
    def test_fetch_self(self):
124
121
        wt = self.make_branch_and_tree('br')
125
 
        self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
 
122
        wt.branch.fetch(wt.branch)
126
123
 
127
124
    def test_fetch_root_knit(self):
128
125
        """Ensure that knit2.fetch() updates the root knit
284
281
        wt.commit("changed file")
285
282
        target = BzrDir.create_branch_and_repo("target/")
286
283
        source = Branch.open(self.get_readonly_url("source/"))
287
 
        self.assertEqual(target.fetch(source), (2, []))
 
284
        target.fetch(source)
288
285
        # this is the path to the literal file. As format changes
289
286
        # occur it needs to be updated. FIXME: ask the store for the
290
287
        # path.
315
312
        source = Branch.open(
316
313
            self.get_readonly_url("source/"),
317
314
            possible_transports=[source.bzrdir.root_transport])
318
 
        self.assertEqual(target.fetch(source), (0, []))
 
315
        target.fetch(source)
319
316
        # should make just two requests
320
317
        http_logs = self.get_readonly_server().logs
321
318
        self.log("web server logs are:")