/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: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
30
30
        self.make_branch_and_tree('me.dev')
31
31
        os.chdir('me.dev')
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
42
42
        self.make_branch_and_tree('!repo')
43
43
        os.chdir('!repo')
44
44
        nick = self.run_bzr('nick')[0]
45
 
        self.assertEqual('!repo\n', nick)
 
45
        self.assertEqual(nick, '!repo\n')
46
46
 
47
47
    def test_bound_nick(self):
48
48
        """Check that nick works well for checkouts."""
49
49
        base = self.make_branch_and_tree('base')
50
50
        child = self.make_branch_and_tree('child')
51
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())
 
52
        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
 
53
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
54
            False)
55
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())
 
56
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
57
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
58
            False)
59
59
 
60
60
        self.run_bzr('unbind')
61
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())
 
62
        self.assertEqual(self.run_bzr('nick')[0][:-1], "explicit_nick")
 
63
        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
 
64
            "explicit_nick")
65
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())
 
66
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
67
        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
 
68
            base.branch.nick)
69
69
 
70
70
    def test_boundless_nick(self):
71
71
        """Nick defaults to implicit local nick when bound branch is AWOL"""
73
73
        child = self.make_branch_and_tree('child')
74
74
        os.chdir('child')
75
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())
 
76
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
77
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
78
            False)
79
79
        osutils.rmtree('../base')
80
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
 
80
        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')