~benoit.pierre/bzrtools/shell_improvements

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Benoît Pierre
  • Date: 2009-08-02 12:55:24 UTC
  • mfrom: (682.1.36 bzrtools)
  • Revision ID: benoit.pierre@gmail.com-20090802125524-1p2oot1y2l0y3o9w
Merge with upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
    'cmd_branch_history': [],
32
32
    'cmd_cbranch': [],
33
33
    'cmd_cdiff': [],
34
 
    'cmd_clean_tree': [],
 
34
    'cmd_conflict_diff': [],
 
35
    'cmd_create_mirror': [],
35
36
    'cmd_fetch_ghosts': ['fetch-missing'],
36
37
    'cmd_graph_ancestry': [],
37
38
    'cmd_import': [],
39
40
    'cmd_multi_pull': [],
40
41
    'cmd_patch': [],
41
42
    'cmd_rspush': [],
42
 
    'cmd_shelf': [],
 
43
    'cmd_shelf1': [],
43
44
    'cmd_shell': [],
44
 
    'cmd_shelve1': ['shelve'],
 
45
    'cmd_shelve1': [],
45
46
    'cmd_trees': [],
46
 
    'cmd_unshelve1': ['unshelve'],
 
47
    'cmd_unshelve1': [],
47
48
    'cmd_zap': [],
48
49
}
49
50
 
73
74
    from doctest import DocTestSuite, ELLIPSIS
74
75
    from unittest import TestSuite
75
76
    import bzrtools
76
 
    import tests.clean_tree
77
77
    import tests.test_dotgraph
78
78
    import tests.is_clean
79
79
    import tests.test_cbranch
 
80
    import tests.test_conflict_diff
 
81
    from bzrlib.plugins.bzrtools.tests import test_fetch_ghosts
80
82
    import tests.test_link_tree
81
83
    import tests.test_patch
82
84
    import tests.test_rspush
 
85
    import tests.test_mirror
83
86
    import tests.upstream_import
84
87
    import zap
85
88
    import tests.blackbox
86
89
    import tests.shelf_tests
87
90
    result = TestSuite()
88
91
    result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
89
 
    result.addTest(tests.clean_tree.test_suite())
90
92
    result.addTest(tests.test_suite())
91
93
    result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
92
94
    result.addTest(tests.blackbox.test_suite())
94
96
    result.addTest(zap.test_suite())
95
97
    result.addTest(TestLoader().loadTestsFromModule(tests.test_dotgraph))
96
98
    result.addTest(TestLoader().loadTestsFromModule(tests.is_clean))
 
99
    result.addTest(TestLoader().loadTestsFromModule(test_fetch_ghosts))
97
100
    result.addTest(TestLoader().loadTestsFromModule(tests.test_link_tree))
98
101
    result.addTest(TestLoader().loadTestsFromModule(tests.test_patch))
99
102
    result.addTest(TestLoader().loadTestsFromModule(tests.test_rspush))
100
103
    result.addTest(TestLoader().loadTestsFromModule(tests.test_cbranch))
 
104
    result.addTest(TestLoader().loadTestsFromModule(tests.test_conflict_diff))
 
105
    result.addTest(TestLoader().loadTestsFromModule(tests.test_mirror))
101
106
    return result