From: nejucomo <nejucomo@gmail.com>
Date: Tue, 29 Jan 2008 05:40:47 +0000 (-0700)
Subject: tahoe_fuse.py: system test: setup: lexically sort test names, create a TestFailure... 
X-Git-Tag: allmydata-tahoe-0.8.0~171
X-Git-Url: https://git.rkrishnan.org/pf/content/en/footer/(%5B%5E?a=commitdiff_plain;h=7421d99f186ac96d09620c445bf24f157507ff64;p=tahoe-lafs%2Ftahoe-lafs.git

tahoe_fuse.py: system test: setup: lexically sort test names, create a TestFailure class, implement an empty directory listing test.
---

diff --git a/contrib/fuse/runtests.py b/contrib/fuse/runtests.py
index c2567252..ff7d3cf2 100644
--- a/contrib/fuse/runtests.py
+++ b/contrib/fuse/runtests.py
@@ -243,7 +243,7 @@ class SystemTest (object):
             
     def run_test_layer(self, mountpoint):
         total = failures = 0
-        for name in dir(self):
+        for name in sorted(dir(self)):
             if name.startswith('test_'):
                 total += 1
                 print '\n*** Running test #%d: %s' % (total, name)
@@ -259,8 +259,10 @@ class SystemTest (object):
         print '\n*** Testing complete: %d failured out of %d.' % (failures, total)           
 
     # Tests:
-    def test_foo(self, mountpoint):
-        raise NotImplementedError('No tests yet...')
+    def test_00_empty_directory_listing(self, mountpoint):
+        listing = os.listdir(mountpoint)
+        if listing:
+            raise self.TestFailure('Expected empty directory, found: %r' % (listing,))
     
 
     # Utilities:
@@ -342,16 +344,19 @@ class SystemTest (object):
         tmpl += 'Waited %.2f seconds (%d polls).'
         raise self.SetupFailure(tmpl, totaltime, attempt+1)
 
+
     # SystemTest Exceptions:
     class Failure (Exception):
-        pass
+        def __init__(self, tmpl, *args):
+            msg = self.Prefix + (tmpl % args)
+            Exception.__init__(self, msg)
     
     class SetupFailure (Failure):
-        def __init__(self, tmpl, *args):
-            msg = 'SystemTest.SetupFailure - The test framework encountered an error:\n'
-            msg += tmpl % args
-            SystemTest.Failure.__init__(self, msg)
+        Prefix = 'Setup Failure - The test framework encountered an error:\n'
 
+    class TestFailure (Failure):
+        Prefix = 'TestFailure: '
+            
 
 ### Unit Tests:
 class TestUtilFunctions (unittest.TestCase):