/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: Ian Clatworthy
  • Date: 2007-12-12 07:05:52 UTC
  • mto: (3118.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3119.
  • Revision ID: ian.clatworthy@internode.on.net-20071212070552-ru9mosc8f6g7elay
more good ideas from abentley

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
48
48
                               '--unchanged', 'branch1'])
49
49
        self.run_bzr(['commit', '-m', 'nothing',
50
50
                               '--unchanged', 'branch1'])
 
51
        this_dir = getcwd()
 
52
        branch2 = "%s/branch2" % (this_dir,)
51
53
        # -r X..Y
52
54
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)
53
55
        self.assertEquals('', out)
54
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
56
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
55
57
                         err)
56
58
        # -r X
57
59
        out, err = self.run_bzr('diff -r revno:2:branch2', retcode=3)
58
60
        self.assertEquals('', out)
59
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
61
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
60
62
                         err)
61
63
        # -r X..
62
64
        out, err = self.run_bzr('diff -r revno:2:branch2..', retcode=3)
63
65
        self.assertEquals('', out)
64
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
66
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (branch2,),
65
67
                         err)
66
68
        # no -r at all.
67
69
        out, err = self.run_bzr('diff', retcode=3)
68
70
        self.assertEquals('', out)
69
 
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
 
71
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (this_dir,),
70
72
                         err)
71
 
 
72