break storage.py into smaller pieces in storage/*.py . No behavioral changes.

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

diff --git a/src/allmydata/test/test_download.py b/src/allmydata/test/test_download.py
index 966547fc87bdb34ea2af61b778995bdd653cf1ce..998cea5413a15386429eaec5b94affb16d735926 100644 (file)
--- a/src/allmydata/test/test_download.py
+++ b/src/allmydata/test/test_download.py
@@ -5,7 +5,8 @@
 
 import os
 from twisted.trial import unittest
-from allmydata import uri, storage
+from allmydata import uri
+from allmydata.storage.server import storage_index_to_dir
 from allmydata.util import base32, fileutil
 from allmydata.immutable import upload
 from allmydata.test.no_network import GridTestMixin
@@ -90,7 +91,7 @@ class DownloadTest(GridTestMixin, unittest.TestCase):
             f.write('immutable_uri = "%s"\n' % ur.uri)
             f.write('immutable_shares = {\n')
             si = uri.from_string(ur.uri).get_storage_index()
-            si_dir = storage.storage_index_to_dir(si)
+            si_dir = storage_index_to_dir(si)
             for (i,ss,ssdir) in self.iterate_servers():
                 sharedir = os.path.join(ssdir, "shares", si_dir)
                 shares = {}
@@ -116,7 +117,7 @@ class DownloadTest(GridTestMixin, unittest.TestCase):
             f.write('mutable_uri = "%s"\n' % n.get_uri())
             f.write('mutable_shares = {\n')
             si = uri.from_string(n.get_uri()).get_storage_index()
-            si_dir = storage.storage_index_to_dir(si)
+            si_dir = storage_index_to_dir(si)
             for (i,ss,ssdir) in self.iterate_servers():
                 sharedir = os.path.join(ssdir, "shares", si_dir)
                 shares = {}
@@ -146,7 +147,7 @@ class DownloadTest(GridTestMixin, unittest.TestCase):
         # this uses the data generated by create_shares() to populate the
         # storage servers with pre-generated shares
         si = uri.from_string(immutable_uri).get_storage_index()
-        si_dir = storage.storage_index_to_dir(si)
+        si_dir = storage_index_to_dir(si)
         for i in immutable_shares:
             shares = immutable_shares[i]
             for shnum in shares:
@@ -158,7 +159,7 @@ class DownloadTest(GridTestMixin, unittest.TestCase):
                 f.close()
 
         si = uri.from_string(mutable_uri).get_storage_index()
-        si_dir = storage.storage_index_to_dir(si)
+        si_dir = storage_index_to_dir(si)
         for i in mutable_shares:
             shares = mutable_shares[i]
             for shnum in shares: