test_cli: oops, fix tests after recent stdout/stderr cleanup
authorBrian Warner <warner@allmydata.com>
Tue, 12 Aug 2008 21:46:34 +0000 (14:46 -0700)
committerBrian Warner <warner@allmydata.com>
Tue, 12 Aug 2008 21:46:34 +0000 (14:46 -0700)
src/allmydata/test/test_cli.py

index da358af7c8451c5fdb134f2ffbb0e607859caf6b..464a597aefde1220761cb5e743ab6d4ec1accb90 100644 (file)
@@ -66,12 +66,12 @@ class CLI(unittest.TestCase):
         self.failUnlessEqual(o.where, "subdir")
 
     def _dump_cap(self, *args):
-        out,err = StringIO(), StringIO()
         config = debug.DumpCapOptions()
+        config.stdout,config.stderr = StringIO(), StringIO()
         config.parseOptions(args)
-        debug.dump_cap(config, out, err)
-        self.failIf(err.getvalue())
-        output = out.getvalue()
+        debug.dump_cap(config)
+        self.failIf(config.stderr.getvalue())
+        output = config.stdout.getvalue()
         return output
 
     def test_dump_cap_chk(self):