← 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

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
1
 
# Copyright (C) 2006-2010, 2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2010, 2012 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
33
33
            cmd.extend(['--directory', directory])
34
34
        # The nick command outputs the nick on a single line
35
35
        actual = self.run_bzr(cmd, working_dir=working_dir)[0][:-1]
36
 
        self.assertEqual(expected, actual)
 
36
        self.assertEquals(expected, actual)
37
37
        if explicit is not None:
38
38
            br = branch.Branch.open(working_dir)
39
39
            conf = br.get_config()
40
 
            self.assertEqual(explicit, conf.has_explicit_nickname())
 
40
            self.assertEquals(explicit, conf.has_explicit_nickname())
41
41
            if explicit:
42
 
                self.assertEqual(expected, conf._get_explicit_nickname())
 
42
                self.assertEquals(expected, conf._get_explicit_nickname())
43
43
 
44
44
    def test_nick_command(self):
45
45
        """bzr nick for viewing, setting nicknames"""