~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2015-10-05 13:45:00 UTC
  • mfrom: (6603.3.1 bts794146)
  • Revision ID: pqm@pqm.ubuntu.com-20151005134500-v244rho557tv0ukd
(vila) Resolve Bug #1480015: Test failure: hexify removed from paramiko
 (Andrew Starr-Bochicchio) (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-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
51
51
    def test_info_empty_controldir(self):
52
52
        self.make_bzrdir('ctrl')
53
53
        out, err = self.run_bzr('info ctrl')
54
 
        self.assertEqual(out,
 
54
        self.assertEquals(out,
55
55
            'Empty control directory (format: 2a or pack-0.92)\n'
56
56
            'Location:\n'
57
57
            '  control directory: ctrl\n')
58
 
        self.assertEqual(err, '')
 
58
        self.assertEquals(err, '')
59
59
 
60
60
    def test_info_empty_controldir_verbose(self):
61
61
        self.make_bzrdir('ctrl')
68
68
            '       control: Meta directory format 1\n\n'
69
69
            'Control directory:\n'
70
70
            '         0 branches\n')
71
 
        self.assertEqual(err, '')
 
71
        self.assertEquals(err, '')
72
72
 
73
73
    def test_info_dangling_branch_reference(self):
74
74
        br = self.make_branch('target')
75
75
        br.create_checkout('from', lightweight=True)
76
76
        shutil.rmtree('target')
77
77
        out, err = self.run_bzr('info from')
78
 
        self.assertEqual(out,
 
78
        self.assertEquals(out,
79
79
            'Dangling branch reference (format: 2a or pack-0.92)\n'
80
80
            'Location:\n'
81
81
            '   control directory: from\n'
82
82
            '  checkout of branch: target\n')
83
 
        self.assertEqual(err, '')
 
83
        self.assertEquals(err, '')
84
84
 
85
85
    def test_info_standalone(self):
86
86
        transport = self.get_transport()