← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
135
135
        out, err = self.run_bzr('push --no-tree -d push-from push-to')
136
136
        self.assertEqual('', out)
137
137
        self.assertEqual('Created new branch.\n', err)
138
 
        self.failIfExists('push-to/file')
 
138
        self.assertPathDoesNotExist('push-to/file')
139
139
 
140
140
    def test_push_new_branch_revision_count(self):
141
141
        # bzr push of a branch with revisions to a new location
199
199
        t.commit(allow_pointless=True,
200
200
                message='first commit')
201
201
        self.run_bzr('push -d from to-one')
202
 
        self.failUnlessExists('to-one')
 
202
        self.assertPathExists('to-one')
203
203
        self.run_bzr('push -d %s %s'
204
204
            % tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
205
 
        self.failUnlessExists('to-two')
 
205
        self.assertPathExists('to-two')
206
206
 
207
207
    def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
208
208
        # See https://bugs.launchpad.net/bzr/+bug/465517
324
324
                     working_dir='tree')
325
325
        new_tree = workingtree.WorkingTree.open('new/tree')
326
326
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
327
 
        self.failUnlessExists('new/tree/a')
 
327
        self.assertPathExists('new/tree/a')
328
328
 
329
329
    def test_push_use_existing(self):
330
330
        """'bzr push --use-existing-dir' can push into an existing dir.
345
345
        new_tree = workingtree.WorkingTree.open('target')
346
346
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
347
347
        # The push should have created target/a
348
 
        self.failUnlessExists('target/a')
 
348
        self.assertPathExists('target/a')
349
349
 
350
350
    def test_push_use_existing_into_empty_bzrdir(self):
351
351
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir