← 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-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

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.failUnlessExists('a/b')
97
 
        self.failUnlessExists('a/d')
98
 
        self.failIfExists('a/g')
 
96
        self.assertPathExists('a/b')
 
97
        self.assertPathExists('a/d')
 
98
        self.assertPathDoesNotExist('a/g')
99
99
        self.expectFailure(
100
100
            "j is in the delta revert applies because j was renamed too",
101
 
            self.failUnlessExists, 'j')
102
 
        self.failUnlessExists('h')
 
101
            self.assertPathExists, 'j')
 
102
        self.assertPathExists('h')
103
103
        self.run_bzr('revert f')
104
 
        self.failIfExists('j')
105
 
        self.failIfExists('h')
106
 
        self.failUnlessExists('a/d/e')
 
104
        self.assertPathDoesNotExist('j')
 
105
        self.assertPathDoesNotExist('h')
 
106
        self.assertPathExists('a/d/e')
107
107
 
108
108
    def test_revert_chatter(self):
109
109
        self._prepare_rename_mod_tree()
148
148
            self.run_bzr('commit -m f')
149
149
            os.unlink('symlink')
150
150
            self.run_bzr('revert')
151
 
            self.failUnlessExists('symlink')
 
151
            self.assertPathExists('symlink')
152
152
            os.unlink('symlink')
153
153
            os.symlink('a-different-path', 'symlink')
154
154
            self.run_bzr('revert')