change docs and --help to use "grid" instead of "virtual drive": closes #892.

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_client.py

diff --git a/src/allmydata/test/test_client.py b/src/allmydata/test/test_client.py
index 1194826afc1519d4d742df609ba6e9640ff29969..9d8f4756124dc923e4011a30c2ded40a8d2e8efa 100644 (file)
--- a/src/allmydata/test/test_client.py
+++ b/src/allmydata/test/test_client.py
@@ -32,20 +32,12 @@ class Basic(unittest.TestCase):
         basedir = "test_client.Basic.test_loadable"
         os.mkdir(basedir)
         open(os.path.join(basedir, "introducer.furl"), "w").write("")
-        open(os.path.join(basedir, "vdrive.furl"), "w").write("")
-        c = client.Client(basedir)
-
-    def test_loadable_without_vdrive(self):
-        basedir = "test_client.Basic.test_loadable_without_vdrive"
-        os.mkdir(basedir)
-        open(os.path.join(basedir, "introducer.furl"), "w").write("")
         c = client.Client(basedir)
 
     def test_loadable_old_config_bits(self):
         basedir = "test_client.Basic.test_loadable_old_config_bits"
         os.mkdir(basedir)
         open(os.path.join(basedir, "introducer.furl"), "w").write("")
-        open(os.path.join(basedir, "vdrive.furl"), "w").write("")
         open(os.path.join(basedir, "no_storage"), "w").write("")
         open(os.path.join(basedir, "readonly_storage"), "w").write("")
         open(os.path.join(basedir, "debug_discard_storage"), "w").write("")
@@ -60,7 +52,6 @@ class Basic(unittest.TestCase):
         basedir = "test_client.Basic.test_loadable_old_storage_config_bits"
         os.mkdir(basedir)
         open(os.path.join(basedir, "introducer.furl"), "w").write("")
-        open(os.path.join(basedir, "vdrive.furl"), "w").write("")
         open(os.path.join(basedir, "readonly_storage"), "w").write("")
         open(os.path.join(basedir, "debug_discard_storage"), "w").write("")
         c = client.Client(basedir)
@@ -72,7 +63,6 @@ class Basic(unittest.TestCase):
         basedir = "test_client.Basic.test_secrets"
         os.mkdir(basedir)
         open(os.path.join(basedir, "introducer.furl"), "w").write("")
-        open(os.path.join(basedir, "vdrive.furl"), "w").write("")
         c = client.Client(basedir)
         secret_fname = os.path.join(basedir, "private", "secret")
         self.failUnless(os.path.exists(secret_fname), secret_fname)
@@ -161,7 +151,6 @@ class Basic(unittest.TestCase):
         basedir = "test_client.Basic.test_versions"
         os.mkdir(basedir)
         open(os.path.join(basedir, "introducer.furl"), "w").write("")
-        open(os.path.join(basedir, "vdrive.furl"), "w").write("")
         c = client.Client(basedir)
         ss = c.getServiceNamed("storage")
         verdict = ss.remote_get_version()