|
1185.62.16
by John Arbash Meinel
Cleanup from Robert Collins. |
1 |
# Copyright (C) 2006 by Canonical Ltd
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
2 |
# -*- coding: utf-8 -*-
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
3 |
#
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
4 |
# This program is free software; you can redistribute it and/or modify
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
8 |
#
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
9 |
# This program is distributed in the hope that it will be useful,
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
13 |
#
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
14 |
# You should have received a copy of the GNU General Public License
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
||
|
1185.62.16
by John Arbash Meinel
Cleanup from Robert Collins. |
19 |
"""Black-box tests for running bzr outside of a working tree."""
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
20 |
|
21 |
import os |
|
|
1551.2.45
by abentley
Fixed outside working tree tests |
22 |
import tempfile |
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
23 |
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
24 |
from bzrlib.tests import ChrootedTestCase |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
25 |
from bzrlib.osutils import getcwd |
26 |
import bzrlib.urlutils as urlutils |
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
27 |
|
28 |
||
29 |
class TestOutsideWT(ChrootedTestCase): |
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
30 |
"""Test that bzr gives proper errors outside of a working tree."""
|
31 |
||
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
32 |
def test_cwd_log(self): |
|
1551.2.45
by abentley
Fixed outside working tree tests |
33 |
os.chdir(tempfile.mkdtemp()) |
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
34 |
out, err = self.run_bzr('log', retcode=3) |
|
1685.1.64
by Martin Pool
[broken] test_cwd_log should expect a path, not a url |
35 |
self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),), |
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
36 |
err) |
37 |
||
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
38 |
def test_url_log(self): |
39 |
url = self.get_readonly_url() + 'subdir/' |
|
|
1185.62.15
by John Arbash Meinel
Adding fix + test for correct error message when not in branch. |
40 |
out, err = self.run_bzr('log', |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
41 |
url, retcode=3) |
42 |
self.assertEqual(u'bzr: ERROR: Not a branch:' |
|
43 |
u' %s\n' % url, err) |
|
|
1881.1.3
by Matthieu Moy
One missing blank line. |
44 |
|
|
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
45 |
def test_diff_ouside_tree(self): |
46 |
os.chdir(tempfile.mkdtemp()) |
|
47 |
self.run_bzr_captured(['init', 'branch1']) |
|
|
1881.1.2
by Matthieu Moy
Formatting and style for the last patch. |
48 |
self.run_bzr_captured(['commit', '-m', 'nothing', |
49 |
'--unchanged', 'branch1']) |
|
50 |
self.run_bzr_captured(['commit', '-m', 'nothing', |
|
51 |
'--unchanged', 'branch1']) |
|
|
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
52 |
# -r X..Y
|
|
1881.1.2
by Matthieu Moy
Formatting and style for the last patch. |
53 |
out, err = self.run_bzr_captured(['diff', |
54 |
'-r', 'revno:2:branch2..revno:1'], |
|
|
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
55 |
retcode=3) |
56 |
self.assertEquals('', out) |
|
57 |
self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),), |
|
58 |
err) |
|
59 |
# -r X
|
|
60 |
out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2'], |
|
61 |
retcode=3) |
|
62 |
self.assertEquals('', out) |
|
63 |
self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),), |
|
64 |
err) |
|
65 |
# -r X..
|
|
66 |
out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..'], |
|
67 |
retcode=3) |
|
68 |
self.assertEquals('', out) |
|
69 |
self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),), |
|
70 |
err) |
|
71 |
# no -r at all.
|
|
72 |
out, err = self.run_bzr_captured(['diff'], |
|
73 |
retcode=3) |
|
74 |
self.assertEquals('', out) |
|
75 |
self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),), |
|
76 |
err) |
|
77 |
||
78 |