← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
93
93
        """Test that revert DIRECTORY does what's expected"""
94
94
        self._prepare_rename_mod_tree()
95
95
        self.run_bzr('revert a')
96
 
        self.assertPathExists('a/b')
97
 
        self.assertPathExists('a/d')
98
 
        self.assertPathDoesNotExist('a/g')
 
96
        self.failUnlessExists('a/b')
 
97
        self.failUnlessExists('a/d')
 
98
        self.failIfExists('a/g')
99
99
        self.expectFailure(
100
100
            "j is in the delta revert applies because j was renamed too",
101
 
            self.assertPathExists, 'j')
102
 
        self.assertPathExists('h')
 
101
            self.failUnlessExists, 'j')
 
102
        self.failUnlessExists('h')
103
103
        self.run_bzr('revert f')
104
 
        self.assertPathDoesNotExist('j')
105
 
        self.assertPathDoesNotExist('h')
106
 
        self.assertPathExists('a/d/e')
 
104
        self.failIfExists('j')
 
105
        self.failIfExists('h')
 
106
        self.failUnlessExists('a/d/e')
107
107
 
108
108
    def test_revert_chatter(self):
109
109
        self._prepare_rename_mod_tree()
120
120
    def test_revert(self):
121
121
        self.run_bzr('init')
122
122
 
123
 
        with file('hello', 'wt') as f: f.write('foo')
 
123
        file('hello', 'wt').write('foo')
124
124
        self.run_bzr('add hello')
125
125
        self.run_bzr('commit -m setup hello')
126
126
 
127
 
        with file('goodbye', 'wt') as f: f.write('baz')
 
127
        file('goodbye', 'wt').write('baz')
128
128
        self.run_bzr('add goodbye')
129
129
        self.run_bzr('commit -m setup goodbye')
130
130
 
131
 
        with file('hello', 'wt') as f: f.write('bar')
132
 
        with file('goodbye', 'wt') as f: f.write('qux')
 
131
        file('hello', 'wt').write('bar')
 
132
        file('goodbye', 'wt').write('qux')
133
133
        self.run_bzr('revert hello')
134
134
        self.check_file_contents('hello', 'foo')
135
135
        self.check_file_contents('goodbye', 'qux')
148
148
            self.run_bzr('commit -m f')
149
149
            os.unlink('symlink')
150
150
            self.run_bzr('revert')
151
 
            self.assertPathExists('symlink')
 
151
            self.failUnlessExists('symlink')
152
152
            os.unlink('symlink')
153
153
            os.symlink('a-different-path', 'symlink')
154
154
            self.run_bzr('revert')
157
157
        else:
158
158
            self.log("skipping revert symlink tests")
159
159
 
160
 
        with file('hello', 'wt') as f: f.write('xyz')
 
160
        file('hello', 'wt').write('xyz')
161
161
        self.run_bzr('commit -m xyz hello')
162
162
        self.run_bzr('revert -r 1 hello')
163
163
        self.check_file_contents('hello', 'foo')