← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/poppy/tests/test_poppy.py

  • Committer: Robert Collins
  • Date: 2010-10-17 21:21:07 UTC
  • mto: This revision was merged to the branch mainline in revision 11736.
  • Revision ID: robert@canonical.com-20101017212107-gyp05138htnu3aek
Rationalise our fixture test support - delete unused stuff, consolidate on the external fixtures API.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/poppy/tests/test_poppy.py
49
49
            self.root_dir, port=self.port, cmd='echo CLOSED')
50
50
        self.poppy.startPoppy()
51
51
 
52
 
    def tearDown(self):
 
52
    def cleanUp(self):
53
53
        self.poppy.killPoppy()
54
54
 
55
55
    def getTransport(self):
129
129
        self._tac = PoppyTac(self.root_dir)
130
130
        self._tac.setUp()
131
131
 
132
 
    def tearDown(self):
 
132
    def cleanUp(self):
133
133
        shutil.rmtree(self._home_dir)
134
134
        os.environ['HOME'] = self._current_home
135
135
        self._tac.tearDown()
199
199
        super(TestPoppy, self).setUp()
200
200
        self.root_dir = self.makeTemporaryDirectory()
201
201
        self.server = self.server_factory(self.root_dir, self.factory)
202
 
        self.installFixture(self.server)
 
202
        self.useFixture(self.server)
203
203
 
204
204
    def _uploadPath(self, path):
205
205
        """Return system path of specified path inside an upload.