fixed skipped tests

filesystem/__init__.py

@@ -11,5 +11,6 @@
     StatWrappersMixin,
     InsecurePathError,
     CrossDeviceRenameError,
+    raise_on_insecure_file_name
     )
 

filesystem/_base.py

@@ -24,6 +24,18 @@ class CrossDeviceRenameError(Exception):
     """
     pass
 
+## utility function for checking for safe file names.
+## TODO: should it be encapsulated within a class?
+def raise_on_insecure_file_name(name):
+    if u'/' in name:
+        raise InsecurePathError(
+            'child name contains directory separator')
+    # this may be too naive
+    if name == u'..':
+        raise InsecurePathError(
+            'child trying to climb out of directory')
+
+
 
 ## TODO: RFC: Is there any presedence for this naming convention?  As
 ## I understand it, "Mixin" means that this class can be mixed into
@@ -203,13 +215,7 @@ def child(self, *segments):
         """
         p = self
         for segment in segments:
-            if u'/' in segment:
-                raise InsecurePathError(
-                      'child name contains directory separator')
-            # this may be too naive
-            if segment == u'..':
-                raise InsecurePathError(
-                      'child trying to climb out of directory')
+            raise_on_insecure_file_name(segment)
             p = p.join(segment)
         return p
 

filesystem/inmem.py

@@ -134,6 +134,7 @@ def child(self, segment=None, *segments):
             return self
 
         if not self._children.has_key(segment):
+            filesystem.raise_on_insecure_file_name(segment)
             child = self.__class__(name=segment, parent=self)
             self._children[segment] = child
 

filesystem/test/test_roundtrip_copyonwrite.py

@@ -14,5 +14,3 @@ def setUp(self):
         self.path = filesystem.copyonwrite.path(real_path)
         assert self.path.exists()
 
-    def test_child_bad_slash(self):
-        raise nose.SkipTest('TODO temporary pardon')

filesystem/test/test_roundtrip_inmem.py

@@ -10,9 +10,3 @@ def setUp(self):
         assert not self.path.exists()
         self.path.mkdir(create_parents=True, may_exist=True)
         assert self.path.exists()
-
-    def test_child_bad_slash(self):
-        raise nose.SkipTest('TODO temporary pardon')
-
-    def test_child_bad_dotdot(self):
-        raise nose.SkipTest('TODO temporary pardon')

filesystem/test/test_roundtrip_multiplexing.py

@@ -15,19 +15,11 @@ def setUp(self):
         self.path.mkdir(create_parents=True, may_exist=True)
         assert self.path.exists()
 
-    def test_child_bad_slash(self):
-        raise nose.SkipTest('TODO temporary pardon')
-
-    def test_child_bad_dotdot(self):
-        raise nose.SkipTest('TODO temporary pardon')
-
 class MultiPlexingLocalFS_Tests(test_roundtrip.OperationsMixin):
     def setUp(self):
         real_path = filesystem.path(maketemp())
         self.path = filesystem.multiplexing.path()
         self.path.bind(real_path)
         assert self.path.exists()
 
-    def test_child_bad_slash(self):
-        raise nose.SkipTest('TODO temporary pardon')
 

filesystem/test/util.py

@@ -39,16 +39,19 @@ def get_nose_name(its_self):
                 return its_self.moduleName
 
     i = 0
-    while True:
-        i += 1
-        frame = sys._getframe(i)
-        # kludge, hunt callers upwards until we find our nose
-        if (frame.f_code.co_varnames
-            and frame.f_code.co_varnames[0] == 'self'):
-            its_self = frame.f_locals['self']
-            name = get_nose_name(its_self)
-            if name is not None:
-                return name
+    try:
+        while True:
+            i += 1
+            frame = sys._getframe(i)
+            # kludge, hunt callers upwards until we find our nose
+            if (frame.f_code.co_varnames
+                and frame.f_code.co_varnames[0] == 'self'):
+                its_self = frame.f_locals['self']
+                name = get_nose_name(its_self)
+                if name is not None:
+                    return name
+    except ValueError:
+        return 'undefined'
 
 def maketemp():
     tmp = os.path.join(os.path.dirname(__file__), 'tmp')