add test case for copying files from outside the FS

fs/memoryfs.py

@@ -513,6 +513,8 @@ class MemoryFS(FS):
     @synchronize
     def copydir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
         src_dir_entry = self._get_dir_entry(src)
+        if src_dir_entry is None:
+            raise ResourceNotFoundError(src)
         src_xattrs = src_dir_entry.xattrs.copy()
         super(MemoryFS, self).copydir(src, dst, overwrite, ignore_errors=ignore_errors, chunk_size=chunk_size)        
         dst_dir_entry = self._get_dir_entry(dst)
@@ -522,6 +524,8 @@ class MemoryFS(FS):
     @synchronize
     def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
         src_dir_entry = self._get_dir_entry(src)
+        if src_dir_entry is None:
+            raise ResourceNotFoundError(src)
         src_xattrs = src_dir_entry.xattrs.copy()
         super(MemoryFS, self).movedir(src, dst, overwrite, ignore_errors=ignore_errors, chunk_size=chunk_size)        
         dst_dir_entry = self._get_dir_entry(dst)
@@ -531,6 +535,8 @@ class MemoryFS(FS):
     @synchronize
     def copy(self, src, dst, overwrite=False, chunk_size=16384):
         src_dir_entry = self._get_dir_entry(src)
+        if src_dir_entry is None:
+            raise ResourceNotFoundError(src)
         src_xattrs = src_dir_entry.xattrs.copy()
         super(MemoryFS, self).copy(src, dst, overwrite, chunk_size)        
         dst_dir_entry = self._get_dir_entry(dst)
@@ -540,6 +546,8 @@ class MemoryFS(FS):
     @synchronize
     def move(self, src, dst, overwrite=False, chunk_size=16384):
         src_dir_entry = self._get_dir_entry(src)
+        if src_dir_entry is None:
+            raise ResourceNotFoundError(src)
         src_xattrs = src_dir_entry.xattrs.copy()
         super(MemoryFS, self).move(src, dst, overwrite, chunk_size)        
         dst_dir_entry = self._get_dir_entry(dst)

fs/osfs/__init__.py

@@ -122,8 +122,8 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS):
 
     def getsyspath(self, path, allow_none=False):
         path = relpath(normpath(path)).replace("/",os.sep)
-        path = os.path.join(self.root_path, path)        
-        path = self._decode_path(path)        
+        path = os.path.join(self.root_path, path)
+        path = self._decode_path(path)
         return path
 
     def unsyspath(self, path):

fs/tests/__init__.py

@@ -440,6 +440,11 @@ class FSTestCases(object):
         self.assert_(check("a/foo/bar/baz.txt"))
 
 
+    def test_cant_copy_from_os(self):
+        sys_executable = os.path.abspath(os.path.realpath(sys.executable))
+        print "COPY", sys_executable
+        self.assertRaises(FSError,self.fs.copy,sys_executable,"py.exe")
+
     def test_copyfile(self):
         check = self.check
         contents = "If the implementation is hard to explain, it's a bad idea."
@@ -457,6 +462,7 @@ class FSTestCases(object):
         self.fs.copy("foo/bar/a.txt", "foo/b.txt")
         self.assert_(check("foo/bar/a.txt"))
         self.assert_(check("foo/b.txt"))
+        self.assert_(checkcontents("foo/bar/a.txt"))
         self.assert_(checkcontents("foo/b.txt"))
 
         self.fs.copy("foo/b.txt", "c.txt")