← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
88
88
            self.run_bzr('commit -m f')
89
89
            os.unlink('symlink')
90
90
            self.run_bzr('revert')
91
 
            self.failUnlessExists('symlink')
 
91
            self.assertPathExists('symlink')
92
92
            os.unlink('symlink')
93
93
            os.symlink('a-different-path', 'symlink')
94
94
            self.run_bzr('revert')
133
133
 
134
134
        os.chdir('../a')
135
135
        out = self.run_bzr('pull --verbose ../b')[0]
136
 
        self.failIfEqual(out.find('Added Revisions:'), -1)
137
 
        self.failIfEqual(out.find('message:\n  added b'), -1)
138
 
        self.failIfEqual(out.find('added b'), -1)
 
136
        self.assertNotEqual(out.find('Added Revisions:'), -1)
 
137
        self.assertNotEqual(out.find('message:\n  added b'), -1)
 
138
        self.assertNotEqual(out.find('added b'), -1)
139
139
 
140
140
        # Check that --overwrite --verbose prints out the removed entries
141
141
        self.run_bzr('commit -m foo --unchanged')
145
145
        out = self.run_bzr('pull --overwrite --verbose ../a')[0]
146
146
 
147
147
        remove_loc = out.find('Removed Revisions:')
148
 
        self.failIfEqual(remove_loc, -1)
 
148
        self.assertNotEqual(remove_loc, -1)
149
149
        added_loc = out.find('Added Revisions:')
150
 
        self.failIfEqual(added_loc, -1)
 
150
        self.assertNotEqual(added_loc, -1)
151
151
 
152
152
        removed_message = out.find('message:\n  baz')
153
 
        self.failIfEqual(removed_message, -1)
154
 
        self.failUnless(remove_loc < removed_message < added_loc)
 
153
        self.assertNotEqual(removed_message, -1)
 
154
        self.assertTrue(remove_loc < removed_message < added_loc)
155
155
 
156
156
        added_message = out.find('message:\n  foo')
157
 
        self.failIfEqual(added_message, -1)
158
 
        self.failUnless(added_loc < added_message)
 
157
        self.assertNotEqual(added_message, -1)
 
158
        self.assertTrue(added_loc < added_message)
159
159
 
160
160
    def test_locations(self):
161
161
        """Using and remembering different locations"""