From: Brian Warner <warner@allmydata.com>
Date: Thu, 13 Nov 2008 22:27:48 +0000 (-0700)
Subject: test_system.py: fix new 'tahoe manifest' tests to not break on windows, by providing... 
X-Git-Tag: allmydata-tahoe-1.3.0~427
X-Git-Url: https://git.rkrishnan.org/provisioning?a=commitdiff_plain;h=9c9994300e33e3fa5226a13508dceeac170b0310;p=tahoe-lafs%2Ftahoe-lafs.git

test_system.py: fix new 'tahoe manifest' tests to not break on windows, by providing --node-directory instead of --node-url
---

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 7e68de37..c631532d 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -1764,6 +1764,8 @@ class MutableChecker(SystemTestMixin, unittest.TestCase, ErrorMixin):
 
     def _run_cli(self, argv):
         stdout, stderr = StringIO(), StringIO()
+        # this can only do synchronous operations
+        assert argv[0] == "debug"
         runner.runner(argv, run_by_human=False, stdout=stdout, stderr=stderr)
         return stdout.getvalue()
 
@@ -2358,7 +2360,10 @@ class DeepCheckWebGood(DeepCheckBase, unittest.TestCase):
         return d
 
     def do_test_cli_good(self, ignored):
-        d = self._run_cli(["manifest", "-u", self.webish_url, self.root_uri])
+        basedir = self.getdir("client0")
+        d = self._run_cli(["manifest",
+                           "--node-directory", basedir,
+                           self.root_uri])
         def _check((out,err)):
             lines = [l for l in out.split("\n") if l]
             self.failUnlessEqual(len(lines), 4)
@@ -2378,7 +2383,8 @@ class DeepCheckWebGood(DeepCheckBase, unittest.TestCase):
         d.addCallback(_check)
 
         d.addCallback(lambda res:
-                      self._run_cli(["manifest", "-u", self.webish_url,
+                      self._run_cli(["manifest",
+                                     "--node-directory", basedir,
                                      "--storage-index", self.root_uri]))
         def _check2((out,err)):
             lines = [l for l in out.split("\n") if l]
@@ -2469,6 +2475,8 @@ class DeepCheckWebBad(DeepCheckBase, unittest.TestCase):
 
     def _run_cli(self, argv):
         stdout, stderr = StringIO(), StringIO()
+        # this can only do synchronous operations
+        assert argv[0] == "debug"
         runner.runner(argv, run_by_human=False, stdout=stdout, stderr=stderr)
         return stdout.getvalue()