more comprehensive pickleability unit test

fs/base.py

@@ -584,9 +584,9 @@ class FS(object):
             except OSError:
                 pass
 
-        def movefile_noerrors(src, dst, overwrite):
+        def movefile_noerrors(src, dst, overwrite, chunk_size):
             try:
-                return self.move(src, dst, overwrite)
+                return self.move(src, dst, overwrite, chunk_size)
             except FSError:
                 return
         if ignore_errors:

fs/expose/fuse/__init__.py

@@ -410,7 +410,6 @@ class MountProcess(subprocess.Popen):
         if nowait or kwds.get("close_fds",False):
             cmd = 'from fs.expose.fuse import MountProcess; '
             cmd = cmd + 'MountProcess._do_mount_nowait(%s)'
-            cmd = cmd % (pickle.dumps((fs,path,fuse_opts)),)
             cmd = cmd % (repr(pickle.dumps((fs,path,fuse_opts),-1)),)
             cmd = [sys.executable,"-c",cmd]
             super(MountProcess,self).__init__(cmd,**kwds)
@@ -430,6 +429,7 @@ class MountProcess(subprocess.Popen):
         self.terminate()
         def killme():
             self.kill()
+            time.sleep(0.1)
             try:
                 unmount(self.path)
             except OSError:

fs/osfs.py

@@ -33,7 +33,8 @@ class OSFS(FS):
         return "<OSFS: %s>" % self.root_path
 
     def getsyspath(self, path, allow_none=False):
-        sys_path = os.path.join(self.root_path, relpath(path)).replace('/', os.sep)
+        path = relpath(path).replace('/', os.sep)
+        sys_path = os.path.join(self.root_path, path)
         return sys_path
 
     @convert_os_errors

fs/tests/__init__.py

@@ -258,6 +258,7 @@ class FSTestCases:
 
         self.fs.movedir("a", "copy of a")
 
+        self.assert_(self.fs.isdir("copy of a"))
         self.assert_(check("copy of a/1.txt"))
         self.assert_(check("copy of a/2.txt"))
         self.assert_(check("copy of a/3.txt"))
@@ -456,6 +457,8 @@ class FSTestCases:
         self.fs.createfile("test1","hello world")
         fs2 = pickle.loads(pickle.dumps(self.fs))
         self.assert_(fs2.isfile("test1"))
+        fs3 = pickle.loads(pickle.dumps(self.fs,-1))
+        self.assert_(fs3.isfile("test1"))