← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Daniel Watkins
  • Date: 2007-08-23 14:10:48 UTC
  • mto: (2759.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2760.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070823141048-hlyyibw24f34voen
Updated tests to reflect new error text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
32
32
    def test_cwd_log(self):
33
33
        os.chdir(tempfile.mkdtemp())
34
34
        out, err = self.run_bzr('log', retcode=3)
35
 
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
35
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
36
36
                         err)
37
37
 
38
38
    def test_url_log(self):
39
39
        url = self.get_readonly_url() + 'subdir/'
40
40
        out, err = self.run_bzr(['log', url], retcode=3)
41
41
        self.assertEqual(u'bzr: ERROR: Not a branch:'
42
 
                         u' %s\n' % url, err)
 
42
                         u' "%s".\n' % url, err)
43
43
 
44
44
    def test_diff_ouside_tree(self):
45
45
        os.chdir(tempfile.mkdtemp())
51
51
        # -r X..Y
52
52
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)
53
53
        self.assertEquals('', out)
54
 
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
54
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
55
55
                         err)
56
56
        # -r X
57
57
        out, err = self.run_bzr('diff -r revno:2:branch2', retcode=3)
58
58
        self.assertEquals('', out)
59
 
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
59
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
60
60
                         err)
61
61
        # -r X..
62
62
        out, err = self.run_bzr('diff -r revno:2:branch2..', retcode=3)
63
63
        self.assertEquals('', out)
64
 
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
64
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
65
65
                         err)
66
66
        # no -r at all.
67
67
        out, err = self.run_bzr('diff', retcode=3)
68
68
        self.assertEquals('', out)
69
 
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
69
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
70
70
                         err)
71
71
 
72
72