← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to buildout-templates/bin/test.in

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-12-30 11:28:39 UTC
  • mfrom: (14606.2.10 apocatest)
  • Revision ID: launchpad@pqm.canonical.com-20111230112839-iogfa6k9x40ymp6c
[r=wgrant][no-qa] Merge canonical.testing into lp.services.testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buildout-templates/bin/test.in
194
194
os.listdir = listdir
195
195
 
196
196
 
197
 
from canonical.testing.customresult import filter_tests, patch_find_tests
 
197
from lp.services.testing.customresult import filter_tests, patch_find_tests
198
198
 
199
199
 
200
200
if __name__ == '__main__':
216
216
    # thunk across to parallel support if needed.
217
217
    if '--parallel' in sys.argv and '--list-tests' not in sys.argv:
218
218
        # thunk over to parallel testing.
219
 
        from canonical.testing.parallel import main
 
219
        from lp.services.testing.parallel import main
220
220
        sys.exit(main(sys.argv))
221
221
 
222
222
    def load_list(option, opt_str, list_name, parser):
246
246
            options.parser.defaults[name] = value
247
247
 
248
248
    # Turn on Layer profiling if requested.
249
 
    from canonical.testing import profiled
 
249
    from lp.services.testing import profiled
250
250
    if local_options.verbose >= 3 and main_process:
251
251
        profiled.setup_profiling()
252
252