From: Brian Warner <warner@allmydata.com>
Date: Thu, 26 Jun 2008 18:36:17 +0000 (-0700)
Subject: test_storage: oops, update the test to match the leave-incoming/ change
X-Git-Tag: allmydata-tahoe-1.2.0~62
X-Git-Url: https://git.rkrishnan.org/%3C?a=commitdiff_plain;h=dfe235bcba13b89267e58849c46fe899b1f32565;p=tahoe-lafs%2Ftahoe-lafs.git

test_storage: oops, update the test to match the leave-incoming/ change
---

diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index fd1a6df5..fca443a6 100644
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -275,8 +275,13 @@ class Server(unittest.TestCase):
         for i,wb in writers.items():
             wb.remote_write(0, "%10d" % i)
             wb.remote_close()
-        incomingdir = os.path.dirname(os.path.dirname(os.path.dirname(wb.incominghome)))
-        self.failIf(os.path.exists(incomingdir))
+        incoming_share_dir = wb.incominghome
+        incoming_bucket_dir = os.path.dirname(incoming_share_dir)
+        incoming_prefix_dir = os.path.dirname(incoming_bucket_dir)
+        incoming_dir = os.path.dirname(incoming_prefix_dir)
+        self.failIf(os.path.exists(incoming_bucket_dir))
+        self.failIf(os.path.exists(incoming_prefix_dir))
+        self.failUnless(os.path.exists(incoming_dir))
 
     def test_allocate(self):
         ss = self.create("test_allocate")