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

fs/remote.py

@@ -269,15 +269,21 @@ class ConnectionManagerFS(WrapFS):
             self._connection_cond.release()
 
     def close(self):
+        # Don't close if we haven't created it
         try:
-            self.wrapped_fs.close()
-        except (RemoteConnectionError,AttributeError):
+            fs = self.__dict__["wrapped_fs"]
+        except KeyError:
             pass
-        if self._poll_thread:
-            self.connected = True
-            self._poll_sleeper.set()
-            self._poll_thread.join()
-            self._poll_thread = None
+        else:
+            try:
+                fs.close()
+            except (RemoteConnectionError,AttributeError):
+                pass
+            if self._poll_thread:
+                self.connected = True
+                self._poll_sleeper.set()
+                self._poll_thread.join()
+                self._poll_thread = None
 
 def _ConnectionManagerFS_method_wrapper(func):
     """Method wrapper for ConnectionManagerFS.

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):