From: Brian Warner <warner@lothar.com>
Date: Wed, 27 Jan 2010 22:40:40 +0000 (-0800)
Subject: test_runner: cleanup, refactor common code into a non-executable method
X-Git-Tag: trac-4200~8
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson//%22%22.?a=commitdiff_plain;h=3880486f911ec3cf1dc3816c4390bc589830e53f;p=tahoe-lafs%2Ftahoe-lafs.git

test_runner: cleanup, refactor common code into a non-executable method

Having both test_node() and test_client() (one of which calls the other) felt
confusing to me, so I changed it to have test_node(), test_client(), and a
common do_create() helper method.
---

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index b9f879af..4aef3da0 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -64,8 +64,7 @@ class CreateNode(unittest.TestCase):
         rc = runner.runner(argv, stdout=out, stderr=err)
         return rc, out.getvalue(), err.getvalue()
 
-    def test_node(self, command="create-node"):
-        basedir = self.workdir("test_node")
+    def do_create(self, command, basedir):
         c1 = os.path.join(basedir, command + "-c1")
         argv = ["--quiet", command, "--basedir", c1]
         rc, out, err = self.run_tahoe(argv)
@@ -74,7 +73,7 @@ class CreateNode(unittest.TestCase):
         self.failUnlessEqual(rc, 0)
         self.failUnless(os.path.exists(c1))
         self.failUnless(os.path.exists(os.path.join(c1, "tahoe-client.tac")))
-        
+
         # tahoe.cfg should exist, and should have storage enabled for
         # 'create-node', and disabled for 'create-client'.
         tahoe_cfg = os.path.join(c1, "tahoe.cfg")
@@ -109,9 +108,14 @@ class CreateNode(unittest.TestCase):
                               runner.runner, argv,
                               run_by_human=False)
 
+    def test_node(self):
+        basedir = self.workdir("test_node")
+        self.do_create("create-node", basedir)
+
     def test_client(self):
         # create-client should behave like create-node --no-storage.
-        self.test_node(command="create-client")
+        basedir = self.workdir("test_client")
+        self.do_create("create-client", basedir)
 
     def test_introducer(self):
         basedir = self.workdir("test_introducer")