From 78c2376fa388cbb79835e92693581c573e5d09fb Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 26 Jun 2007 16:51:38 -0700 Subject: [PATCH] more runner.py test coverage: don't bypass argv parsing --- src/allmydata/test/test_system.py | 9 ++++-- src/allmydata/test/test_vdrive.py | 52 +++++++++++++++++-------------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 509b7f46..4f14731c 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -376,9 +376,12 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase): log.msg("test_system.SystemTest._test_runner using %s" % dirpath) filename = os.path.join(dirpath, "uri_extension") - s = StringIO() - rc = runner.dump_uri_extension({'filename': filename}, s) - output = s.getvalue() + + out,err = StringIO(), StringIO() + rc = runner.runner(["dump-uri-extension", + filename], + stdout=out, stderr=err) + output = out.getvalue() self.failUnlessEqual(rc, 0) # we only upload a single file, so we can assert some things about diff --git a/src/allmydata/test/test_vdrive.py b/src/allmydata/test/test_vdrive.py index e5a49b11..bfd9415a 100644 --- a/src/allmydata/test/test_vdrive.py +++ b/src/allmydata/test/test_vdrive.py @@ -244,19 +244,22 @@ class Test(unittest.TestCase): def _test_one_3(self, res): # now test some of the diag tools with the data we've created - s = StringIO() - rc = runner.dump_root_dirnode("vdrive/test_one", {}, s) - output = s.getvalue() + out,err = StringIO(), StringIO() + rc = runner.runner(["dump-root-dirnode", "vdrive/test_one"], + stdout=out, stderr=err) + output = out.getvalue() self.failUnless(output.startswith("URI:DIR:fakeFURL:")) self.failUnlessEqual(rc, 0) - s = StringIO() - args = {'uri': self.bar_node.get_uri(), - 'verbose': True, - } - rc = runner.dump_directory_node("vdrive/test_one", args, s) - output = s.getvalue() + out,err = StringIO(), StringIO() + rc = runner.runner(["dump-dirnode", + "--basedir", "vdrive/test_one", + "--verbose", + self.bar_node.get_uri()], + stdout=out, stderr=err) + output = out.getvalue() #print output + self.failUnlessEqual(rc, 0) self.failUnless("dirnode uri: URI:DIR:myFURL" in output) self.failUnless("write_enabler" in output) self.failIf("write_enabler: None" in output) @@ -265,15 +268,16 @@ class Test(unittest.TestCase): self.failUnless(" read: URI:DIR-RO:myFURL:" in output) self.failUnless("key file4\n" in output) self.failUnless("H_key " in output) - self.failUnlessEqual(rc, 0) - s = StringIO() - args = {'uri': self.bar_node.get_uri(), - 'verbose': False, - } - rc = runner.dump_directory_node("vdrive/test_one", args, s) - output = s.getvalue() + out,err = StringIO(), StringIO() + rc = runner.runner(["dump-dirnode", + "--basedir", "vdrive/test_one", + # non-verbose + "--uri", self.bar_node.get_uri()], + stdout=out, stderr=err) + output = out.getvalue() #print output + self.failUnlessEqual(rc, 0) self.failUnless("dirnode uri: URI:DIR:myFURL" in output) self.failUnless("write_enabler" in output) self.failIf("write_enabler: None" in output) @@ -282,22 +286,22 @@ class Test(unittest.TestCase): self.failUnless(" read: URI:DIR-RO:myFURL:" in output) self.failUnless("key file4\n" in output) self.failIf("H_key " in output) - self.failUnlessEqual(rc, 0) - s = StringIO() - args = {'uri': self.bar_node_readonly.get_uri(), - 'verbose': True, - } - rc = runner.dump_directory_node("vdrive/test_one", args, s) - output = s.getvalue() + out,err = StringIO(), StringIO() + rc = runner.runner(["dump-dirnode", + "--basedir", "vdrive/test_one", + "--verbose", + self.bar_node_readonly.get_uri()], + stdout=out, stderr=err) + output = out.getvalue() #print output + self.failUnlessEqual(rc, 0) self.failUnless("dirnode uri: URI:DIR-RO:myFURL" in output) self.failUnless("write_enabler: None" in output) self.failUnless("key baz\n" in output) self.failIf(" write: URI:DIR:myFURL:" in output) self.failUnless(" read: URI:DIR-RO:myFURL:" in output) self.failUnless("key file4\n" in output) - self.failUnlessEqual(rc, 0) def shouldFail(self, res, expected_failure, which, substring=None): if isinstance(res, failure.Failure): -- 2.45.2