/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2008-02-06 04:06:42 UTC
  • mfrom: (3216 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3217.
  • Revision ID: robertc@robertcollins.net-20080206040642-2efx3l4iv5f95lxp
Merge up with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
21
21
import os
22
22
import tempfile
23
23
 
24
 
from bzrlib.tests import ChrootedTestCase
25
 
from bzrlib.osutils import getcwd
26
 
import bzrlib.urlutils as urlutils
27
 
 
28
 
 
29
 
class TestOutsideWT(ChrootedTestCase):
 
24
from bzrlib import (
 
25
    osutils,
 
26
    tests,
 
27
    urlutils,
 
28
    )
 
29
 
 
30
 
 
31
class TestOutsideWT(tests.ChrootedTestCase):
30
32
    """Test that bzr gives proper errors outside of a working tree."""
31
33
 
32
34
    def test_cwd_log(self):
33
 
        os.chdir(tempfile.mkdtemp())
 
35
        tmp_dir = tempfile.mkdtemp()
 
36
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
37
        os.chdir(tmp_dir)
34
38
        out, err = self.run_bzr('log', retcode=3)
35
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
39
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n'
 
40
                         % (osutils.getcwd(),),
36
41
                         err)
37
42
 
38
43
    def test_url_log(self):
41
46
        self.assertEqual(u'bzr: ERROR: Not a branch:'
42
47
                         u' "%s".\n' % url, err)
43
48
 
44
 
    def test_diff_ouside_tree(self):
45
 
        os.chdir(tempfile.mkdtemp())
 
49
    def test_diff_outside_tree(self):
 
50
        tmp_dir = tempfile.mkdtemp()
 
51
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
52
        os.chdir(tmp_dir)
46
53
        self.run_bzr('init branch1')
47
54
        self.run_bzr(['commit', '-m', 'nothing',
48
55
                               '--unchanged', 'branch1'])
49
56
        self.run_bzr(['commit', '-m', 'nothing',
50
57
                               '--unchanged', 'branch1'])
 
58
        this_dir = osutils.getcwd()
 
59
        branch2 = "%s/branch2" % (this_dir,)
51
60
        # -r X..Y
52
61
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)
53
62
        self.assertEquals('', out)
54
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
63
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
55
64
                         err)
56
65
        # -r X
57
66
        out, err = self.run_bzr('diff -r revno:2:branch2', retcode=3)
58
67
        self.assertEquals('', out)
59
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
68
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
60
69
                         err)
61
70
        # -r X..
62
71
        out, err = self.run_bzr('diff -r revno:2:branch2..', retcode=3)
63
72
        self.assertEquals('', out)
64
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
73
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
65
74
                         err)
66
75
        # no -r at all.
67
76
        out, err = self.run_bzr('diff', retcode=3)
68
77
        self.assertEquals('', out)
69
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
78
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (this_dir,),
70
79
                         err)
71
 
 
72