← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
1
 
# Copyright (C) 2005, 2006  Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
import bzrlib
22
22
from bzrlib import osutils
23
 
from bzrlib.tests.blackbox import ExternalBase
24
 
 
25
 
 
26
 
class TestNick(ExternalBase):
 
23
from bzrlib.tests import TestCaseWithTransport
 
24
 
 
25
 
 
26
class TestNick(TestCaseWithTransport):
27
27
 
28
28
    def test_nick_command(self):
29
29
        """bzr nick for viewing, setting nicknames"""
78
78
                         child.branch.get_config().has_explicit_nickname())
79
79
        osutils.rmtree('../base')
80
80
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
 
81
 
 
82
    def test_nick_directory(self):
 
83
        """Test --directory option"""
 
84
        self.make_branch_and_tree('me.dev')
 
85
        nick = self.run_bzr(['nick', '--directory=me.dev'])[0]
 
86
        self.assertEqual('me.dev\n', nick)
 
87
        self.run_bzr(['nick', '-d', 'me.dev', 'moo'])
 
88
        nick = self.run_bzr(['nick', '--directory', 'me.dev'])[0]
 
89
        self.assertEqual('moo\n', nick)