~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/testing/fixture.py

  • Committer: Curtis Hovey
  • Date: 2011-12-28 17:03:06 UTC
  • mto: This revision was merged to the branch mainline in revision 14605.
  • Revision ID: curtis.hovey@canonical.com-20111228170306-n9fz94h85ckaoaf3
Separate test-authoring classes from test-running classes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
        super(PGBouncerFixture, self).__init__()
68
68
 
69
69
        # Known databases
70
 
        from canonical.testing.layers import DatabaseLayer
 
70
        from lp.testing.layers import DatabaseLayer
71
71
        dbnames = [
72
72
            DatabaseLayer._db_fixture.dbname,
73
73
            DatabaseLayer._db_template_fixture.dbname,
114
114
        as we are using a test layer that doesn't provide database
115
115
        connections.
116
116
        """
117
 
        from canonical.testing.layers import (
 
117
        from lp.testing.layers import (
118
118
            reconnect_stores,
119
119
            is_ca_available,
120
120
            )
233
233
 
234
234
    def setUp(self):
235
235
        # Work around circular import.
236
 
        from canonical.testing.layers import wsgi_application
 
236
        from lp.testing.layers import wsgi_application
237
237
        super(Urllib2Fixture, self).setUp()
238
238
        add_wsgi_intercept('launchpad.dev', 80, lambda: wsgi_application)
239
239
        self.addCleanup(remove_wsgi_intercept, 'launchpad.dev', 80)