← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2013, 2016 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
44
44
                     'test_ancestry',
45
45
                     'test_annotate',
46
46
                     'test_branch',
 
47
                     'test_branches',
47
48
                     'test_break_lock',
48
49
                     'test_bound_branches',
49
50
                     'test_bundle_info',
63
64
                     'test_dpush',
64
65
                     'test_exceptions',
65
66
                     'test_export',
 
67
                     'test_export_pot',
66
68
                     'test_filesystem_cicp',
67
69
                     'test_filtered_view_ops',
68
70
                     'test_find_merge_base',
83
85
                     'test_merge',
84
86
                     'test_merge_directive',
85
87
                     'test_missing',
 
88
                     'test_mkdir',
86
89
                     'test_modified',
87
90
                     'test_mv',
88
91
                     'test_nick',
89
92
                     'test_non_ascii',
90
93
                     'test_outside_wt',
91
94
                     'test_pack',
 
95
                     'test_ping',
92
96
                     'test_pull',
93
97
                     'test_push',
94
98
                     'test_reconcile',
111
115
                     'test_send',
112
116
                     'test_serve',
113
117
                     'test_shared_repository',
 
118
                     'test_shell_complete',
114
119
                     'test_shelve',
115
120
                     'test_sign_my_commits',
 
121
                     'test_verify_signatures',
116
122
                     'test_split',
117
123
                     'test_status',
118
124
                     'test_switch',
145
151
        The output is supplied first, so that you can supply a variable
146
152
        number of arguments to bzr.
147
153
        """
148
 
        self.assertEquals(self.run_bzr(*args)[0], output)
 
154
        self.assertEqual(self.run_bzr(*args)[0], output)