← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Stuart Bishop
  • Date: 2012-01-04 08:32:16 UTC
  • mfrom: (8758.3.28 garbo)
  • mto: This revision was merged to the branch mainline in revision 14630.
  • Revision ID: stuart.bishop@canonical.com-20120104083216-u40lz91ftkpzsqqp
Merged garbo into garbo-bulk-pruner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buildout-templates/bin/test.in
78
78
    sys.exit(-1 * signal.SIGTERM)
79
79
signal.signal(signal.SIGTERM, exit_with_atexit_handlers)
80
80
 
81
 
# Tell canonical.config to use the testrunner config instance.
82
 
from canonical.config import config
 
81
# Tell lp.services.config to use the testrunner config instance.
 
82
from lp.services.config import config
83
83
config.setInstance('testrunner')
84
84
config.generate_overrides()
85
85
 
88
88
sys.path[:] = [p for p in sys.path if os.path.abspath(p) != BUILD_DIR]
89
89
 
90
90
# Turn on psycopg debugging wrapper
91
 
#import canonical.database.debug
92
 
#canonical.database.debug.install()
 
91
#import lp.services.database.debug
 
92
#lp.services.database.debug.install()
93
93
 
94
94
# Unset the http_proxy environment variable, because we're going to make
95
95
# requests to localhost and we don't wand this to be proxied.
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