.

wcfs/__init__.py

@@ -37,11 +37,11 @@ from ZODB.FileStorage import FileStorage
 class WCFS(object):
     # XXX + .zurl?
     # .mountpoint   path to mountpoint
-    # ._fwcfs       /.wcfs opened
+    # ._fwcfs       /.wcfs opened to keep the server from going away (at least cleanly)
 
-    def __init__(self, mountpoint):
+    def __init__(self, mountpoint, fwcfs):
         self.mountpoint = mountpoint
-        # XXX open a file to keep the server from going away (at least cleanly)
+        self._fwcfs     = fwcfs
 
 
 # serve starts and runs wcfs server for ZODB @ zurl.
@@ -160,6 +160,7 @@ def _start(zurl):
                     if e.errno != ENOENT:
                         raise
                 else:
+                    # TODO read .wcfs and verify it = zurl
                     res = f
                     break
 
@@ -193,7 +194,7 @@ def _start(zurl):
         err = _rx
 
     if _ == 1:
-        if not isinstance(_rx, file):
+        if isinstance(_rx, file):
             # mounted ok - return WCFS object
             f = _rx
             startedok.close()

wcfs/wcfs_test.py

@@ -40,7 +40,7 @@ def test_join():
         wcfs.join(zurl, autostart=False)
 
     wc = wcfs._start(zurl)
-    assert isinstance(wcfs.WCFS)
+    assert isinstance(wc, wcfs.WCFS)
 
     #wc = wcfs.join(zurl, autostart=False)