/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: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
37
37
 
38
38
    def test_url_log(self):
39
39
        url = self.get_readonly_url() + 'subdir/'
40
 
        out, err = self.run_bzr('log', 
41
 
                                url, retcode=3)
 
40
        out, err = self.run_bzr(['log', url], retcode=3)
42
41
        self.assertEqual(u'bzr: ERROR: Not a branch:'
43
42
                         u' %s\n' % url, err)
44
43
 
45
44
    def test_diff_ouside_tree(self):
46
45
        os.chdir(tempfile.mkdtemp())
47
 
        self.run_bzr(['init', 'branch1'])
48
 
        self.run_bzr(['commit', '-m', 'nothing', 
 
46
        self.run_bzr('init branch1')
 
47
        self.run_bzr(['commit', '-m', 'nothing',
49
48
                               '--unchanged', 'branch1'])
50
 
        self.run_bzr(['commit', '-m', 'nothing', 
 
49
        self.run_bzr(['commit', '-m', 'nothing',
51
50
                               '--unchanged', 'branch1'])
52
51
        # -r X..Y
53
 
        out, err = self.run_bzr(['diff', 
54
 
                                          '-r', 'revno:2:branch2..revno:1'],
55
 
                                         retcode=3)
 
52
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)
56
53
        self.assertEquals('', out)
57
54
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
58
55
                         err)
59
56
        # -r X
60
 
        out, err = self.run_bzr(['diff', '-r', 'revno:2:branch2'],
61
 
                                         retcode=3)
 
57
        out, err = self.run_bzr('diff -r revno:2:branch2', retcode=3)
62
58
        self.assertEquals('', out)
63
59
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
64
60
                         err)
65
61
        # -r X..
66
 
        out, err = self.run_bzr(['diff', '-r', 'revno:2:branch2..'],
67
 
                                         retcode=3)
 
62
        out, err = self.run_bzr('diff -r revno:2:branch2..', retcode=3)
68
63
        self.assertEquals('', out)
69
64
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
70
65
                         err)
71
66
        # no -r at all.
72
 
        out, err = self.run_bzr(['diff'],
73
 
                                         retcode=3)
 
67
        out, err = self.run_bzr('diff', retcode=3)
74
68
        self.assertEquals('', out)
75
69
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
76
70
                         err)
77
 
        
 
71
 
78
72