From: Brian Warner <warner@allmydata.com>
Date: Tue, 12 Aug 2008 21:46:34 +0000 (-0700)
Subject: test_cli: oops, fix tests after recent stdout/stderr cleanup
X-Git-Url: https://git.rkrishnan.org/simplejson/quickstart.html?a=commitdiff_plain;h=022fcf3db8c677d02c0c465ab6edfd8a0814b165;p=tahoe-lafs%2Ftahoe-lafs.git

test_cli: oops, fix tests after recent stdout/stderr cleanup
---

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index da358af7..464a597a 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -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):