~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge Windows test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
    def test_cwd_log(self):
34
34
        tmp_dir = osutils.mkdtemp()
35
35
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
36
        self.addCleanup(lambda: os.chdir('..'))
36
37
        os.chdir(tmp_dir)
37
38
        out, err = self.run_bzr('log', retcode=3)
38
39
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n'
48
49
    def test_diff_outside_tree(self):
49
50
        tmp_dir = osutils.mkdtemp()
50
51
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
52
        self.addCleanup(lambda: os.chdir('..'))
51
53
        os.chdir(tmp_dir)
52
54
        self.run_bzr('init branch1')
53
55
        self.run_bzr(['commit', '-m', 'nothing',