← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr.
19
19
 
20
20
These check that it behaves properly when it's invoked through the regular
21
 
command-line interface. This doesn't actually run a new interpreter but 
 
21
command-line interface. This doesn't actually run a new interpreter but
22
22
rather starts again from the run_bzr function.
23
23
"""
24
24
 
25
 
import sys
26
25
 
27
 
from bzrlib.tests import (
28
 
                          adapt_modules,
29
 
                          TestCaseWithTransport,
30
 
                          iter_suite_tests,
31
 
                          )
32
 
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
33
 
from bzrlib.symbol_versioning import (
34
 
    deprecated_method,
35
 
    )
36
 
import bzrlib.ui as ui
 
26
from bzrlib.tests import TestCaseWithTransport
37
27
 
38
28
 
39
29
def load_tests(basic_tests, module, loader):
57
47
                     'bzrlib.tests.blackbox.test_cat_revision',
58
48
                     'bzrlib.tests.blackbox.test_check',
59
49
                     'bzrlib.tests.blackbox.test_checkout',
 
50
                     'bzrlib.tests.blackbox.test_clean_tree',
60
51
                     'bzrlib.tests.blackbox.test_command_encoding',
61
52
                     'bzrlib.tests.blackbox.test_commit',
62
53
                     'bzrlib.tests.blackbox.test_conflicts',
87
78
                     'bzrlib.tests.blackbox.test_modified',
88
79
                     'bzrlib.tests.blackbox.test_mv',
89
80
                     'bzrlib.tests.blackbox.test_nick',
 
81
                     'bzrlib.tests.blackbox.test_non_ascii',
90
82
                     'bzrlib.tests.blackbox.test_outside_wt',
91
83
                     'bzrlib.tests.blackbox.test_pack',
92
84
                     'bzrlib.tests.blackbox.test_pull',
125
117
                     ]
126
118
    # add the tests for the sub modules
127
119
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
128
 
 
129
 
    test_encodings = [
130
 
        'bzrlib.tests.blackbox.test_non_ascii',
131
 
    ]
132
 
 
133
 
    adapter = EncodingTestAdapter()
134
 
    adapt_modules(test_encodings, adapter, loader, suite)
135
 
 
136
120
    return suite
137
121
 
138
122