test_remote.DisconnectingFS: only raise RemoteConnectionError from actual FS interface methods

fs/remote.py

@@ -269,8 +269,14 @@ class ConnectionManagerFS(WrapFS):
             self._connection_cond.release()
 
     def close(self):
+        # Don't close if we haven't created it
         try:
-            self.wrapped_fs.close()
+            fs = self.__dict__["wrapped_fs"]
+        except KeyError:
+            pass
+        else:
+            try:
+                fs.close()
             except (RemoteConnectionError,AttributeError):
                 pass
             if self._poll_thread:

fs/tests/test_remote.py

@@ -73,10 +73,15 @@ class DisconnectingFS(WrapFS):
         self._connected = True
         self.wrapped_fs.close()
 
-    def _encode(self,path):
+def disconnecting_wrapper(func):
+    """Method wrapper to raise RemoteConnectionError if not connected."""
+    @wraps(func)
+    def wrapper(self,*args,**kwds):
         if not self._connected:
             raise RemoteConnectionError("")
-        return path
+        return func(self,*args,**kwds)
+    return wrapper
+DisconnectingFS = wrap_fs_methods(disconnecting_wrapper)(DisconnectingFS)
 
 
 class DisconnectRecoveryFS(WrapFS):