From: Brian Warner Date: Fri, 1 Jun 2007 01:31:01 +0000 (-0700) Subject: test_system.py: minor reformatting X-Git-Tag: allmydata-tahoe-0.3.0~43 X-Git-Url: https://git.rkrishnan.org/pf/content/de.html?a=commitdiff_plain;h=edaed9c32c8a80339782e772ac56873420a03000;p=tahoe-lafs%2Ftahoe-lafs.git test_system.py: minor reformatting --- diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 19008cbf..7106aa42 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -3,7 +3,8 @@ import os from twisted.trial import unittest from twisted.internet import defer, reactor from twisted.application import service -from allmydata import client, introducer_and_vdrive, uri, download +from allmydata import client, uri, download +from allmydata.introducer_and_vdrive import IntroducerAndVdrive from allmydata.util import idlib, fileutil, testutil from foolscap.eventual import flushEventualQueue from twisted.python import log @@ -38,10 +39,11 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase): def set_up_nodes(self, NUMCLIENTS=5): self.numclients = NUMCLIENTS - introducer_and_vdrive_dir = self.getdir("introducer_and_vdrive") - if not os.path.isdir(introducer_and_vdrive_dir): - fileutil.make_dirs(introducer_and_vdrive_dir) - self.introducer_and_vdrive = self.add_service(introducer_and_vdrive.IntroducerAndVdrive(basedir=introducer_and_vdrive_dir)) + iv_dir = self.getdir("introducer_and_vdrive") + if not os.path.isdir(iv_dir): + fileutil.make_dirs(iv_dir) + iv = IntroducerAndVdrive(basedir=iv_dir) + self.introducer_and_vdrive = self.add_service(iv) d = self.introducer_and_vdrive.when_tub_ready() d.addCallback(self._set_up_nodes_2) return d