← 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: Martin Pool
  • Date: 2007-06-26 10:12:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626101233-hrmvl09320gt6b8m
Deprecate run_bzr_captured in favour of just  run_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
43
43
        f.close()
44
44
 
45
45
        # check status
46
 
        self.assertEquals('modified:\n  dir/file\n', self.run_bzr_captured(['status'])[0])
 
46
        self.assertEquals('modified:\n  dir/file\n', self.run_bzr(['status'])[0])
47
47
 
48
48
    def _prepare_rename_mod_tree(self):
49
49
        self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g', 
66
66
        os.chdir('dir')
67
67
        mutter('cd dir\n')
68
68
 
69
 
        self.assertEquals('1\n', self.run_bzr_captured(['revno'])[0])
 
69
        self.assertEquals('1\n', self.run_bzr(['revno'])[0])
70
70
        self.run_bzr('revert %s file' % param)
71
71
        self.assertEquals('spam', open('file', 'rb').read())
72
72
 
85
85
        self.run_bzr('checkout --lightweight . ../sprach')
86
86
        self.run_bzr('commit -m more')
87
87
        os.chdir('../sprach')
88
 
        self.assertEqual('', self.run_bzr_captured(['status'])[0])
 
88
        self.assertEqual('', self.run_bzr(['status'])[0])
89
89
        self.run_bzr('revert')
90
 
        self.assertEqual('', self.run_bzr_captured(['status'])[0])
 
90
        self.assertEqual('', self.run_bzr(['status'])[0])
91
91
 
92
92
    def test_revert_dirname(self):
93
93
        """Test that revert DIRECTORY does what's expected"""