/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_nick.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-26 20:32:49 UTC
  • mto: (2581.1.1 cleanup-runbzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: v.ladeuil+lp@free.fr-20070626203249-sqm4afiai5dxofum
Deprecate the varargs syntax and fix the tests.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Activate the deprecation warning.
(TestCase.run_bzr_error): Add error_regexes to kwargs or run_bzr
get confused.

* bzrlib/tests/blackbox/test_selftest.py:
(TestRunBzr.test_args): Activate.

* bzrlib/tests/blackbox/test_inventory.py:
(TestInventory.assertInventoryEqual): Build the command from args
if not None.

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.ls_equals): Build the command from args if not None.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_lightweight_checkout_explicit):
Nice catch, we were calling run_bzr instead of run_bzr_error. This
went unnoticed for some time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Black-box tests for bzr nick."""
18
18
 
19
19
import os
20
20
 
21
21
import bzrlib
22
 
from bzrlib import osutils
23
22
from bzrlib.tests.blackbox import ExternalBase
24
23
 
25
24
 
27
26
 
28
27
    def test_nick_command(self):
29
28
        """bzr nick for viewing, setting nicknames"""
30
 
        self.make_branch_and_tree('me.dev')
 
29
        os.mkdir('me.dev')
31
30
        os.chdir('me.dev')
 
31
        self.run_bzr('init')
32
32
        nick = self.run_bzr('nick')[0]
33
 
        self.assertEqual('me.dev\n', nick)
 
33
        self.assertEqual(nick, 'me.dev\n')
34
34
        # set the nickname
35
35
        self.run_bzr("nick moo")
36
36
        nick = self.run_bzr('nick')[0]
37
 
        self.assertEqual('moo\n', nick)
 
37
        self.assertEqual(nick, 'moo\n')
38
38
 
39
39
    def test_autonick_urlencoded(self):
40
40
        # https://bugs.launchpad.net/bzr/+bug/66857 -- nick was printed
41
41
        # urlencoded but shouldn't be
42
 
        self.make_branch_and_tree('!repo')
 
42
        os.mkdir('!repo')
43
43
        os.chdir('!repo')
 
44
        self.run_bzr('init')
44
45
        nick = self.run_bzr('nick')[0]
45
 
        self.assertEqual('!repo\n', nick)
46
 
 
47
 
    def test_bound_nick(self):
48
 
        """Check that nick works well for checkouts."""
49
 
        base = self.make_branch_and_tree('base')
50
 
        child = self.make_branch_and_tree('child')
51
 
        os.chdir('child')
52
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
53
 
        self.assertEqual(False,
54
 
                         child.branch.get_config().has_explicit_nickname())
55
 
        self.run_bzr('bind ../base')
56
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
57
 
        self.assertEqual(False,
58
 
                         child.branch.get_config().has_explicit_nickname())
59
 
 
60
 
        self.run_bzr('unbind')
61
 
        self.run_bzr("nick explicit_nick")
62
 
        self.assertEqual("explicit_nick", self.run_bzr('nick')[0][:-1])
63
 
        self.assertEqual("explicit_nick",
64
 
                         child.branch.get_config()._get_explicit_nickname())
65
 
        self.run_bzr('bind ../base')
66
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
67
 
        self.assertEqual(base.branch.nick,
68
 
                         child.branch.get_config()._get_explicit_nickname())
69
 
 
70
 
    def test_boundless_nick(self):
71
 
        """Nick defaults to implicit local nick when bound branch is AWOL"""
72
 
        base = self.make_branch_and_tree('base')
73
 
        child = self.make_branch_and_tree('child')
74
 
        os.chdir('child')
75
 
        self.run_bzr('bind ../base')
76
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
77
 
        self.assertEqual(False,
78
 
                         child.branch.get_config().has_explicit_nickname())
79
 
        osutils.rmtree('../base')
80
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
 
46
        self.assertEqual(nick, '!repo\n')