class MountTestBase(unittest.TestCase):
def setUp(self):
+ # The underlying C implementation of open() makes a fstat() syscall
+ # with the GIL still held. When the GETATTR message comes back to
+ # llfuse (which in these tests is in the same interpreter process) it
+ # can't acquire the GIL, so it can't service the fstat() call, so it
+ # deadlocks. The workaround is to run some of our test code in a
+ # separate process. Forturnately the multiprocessing module makes this
+ # relatively easy.
+ self.pool = multiprocessing.Pool(1)
+
self.keeptmp = tempfile.mkdtemp()
os.environ['KEEP_LOCAL_STORE'] = self.keeptmp
self.mounttmp = tempfile.mkdtemp()
self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings())
def make_mount(self, root_class, **root_kwargs):
- self.operations = fuse.Operations(os.getuid(), os.getgid())
+ self.operations = fuse.Operations(os.getuid(), os.getgid(), enable_write=True)
self.operations.inodes.add_entry(root_class(
llfuse.ROOT_INODE, self.operations.inodes, self.api, 0, **root_kwargs))
llfuse.init(self.operations, self.mounttmp, [])
return self.operations.inodes[llfuse.ROOT_INODE]
def tearDown(self):
+ self.pool.terminate()
+ self.pool.join()
+ del self.pool
+
# llfuse.close is buggy, so use fusermount instead.
#llfuse.close(unmount=True)
+
count = 0
success = 1
while (count < 9 and success != 0):
success = subprocess.call(["fusermount", "-u", self.mounttmp])
- time.sleep(0.5)
+ time.sleep(0.1)
count += 1
+ self.operations.destroy()
+
os.rmdir(self.mounttmp)
shutil.rmtree(self.keeptmp)
run_test_server.reset()
d3 = llfuse.listdir(os.path.join(self.mounttmp, 'Unrestricted public data', 'GNU General Public License, version 3'))
self.assertEqual(["GNU_General_Public_License,_version_3.pdf"], d3)
-class FuseUpdateFileTest(MountTestBase):
+
+def fuseModifyFileTestHelperReadStartContents(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ d1 = llfuse.listdir(mounttmp)
+ self.assertEqual(["file1.txt"], d1)
+ with open(os.path.join(mounttmp, "file1.txt")) as f:
+ self.assertEqual("blub", f.read())
+ Test().runTest()
+
+def fuseModifyFileTestHelperReadEndContents(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ d1 = llfuse.listdir(mounttmp)
+ self.assertEqual(["file1.txt"], d1)
+ with open(os.path.join(mounttmp, "file1.txt")) as f:
+ self.assertEqual("plnp", f.read())
+ Test().runTest()
+
+class FuseModifyFileTest(MountTestBase):
def runTest(self):
collection = arvados.collection.Collection(api_client=self.api)
with collection.open("file1.txt", "w") as f:
with llfuse.lock:
m.new_collection(collection.api_response(), collection)
- d1 = llfuse.listdir(self.mounttmp)
- self.assertEqual(["file1.txt"], d1)
- with open(os.path.join(self.mounttmp, "file1.txt")) as f:
- self.assertEqual("blub", f.read())
+ self.pool.apply(fuseModifyFileTestHelperReadStartContents, (self.mounttmp,))
with collection.open("file1.txt", "w") as f:
f.write("plnp")
- d1 = llfuse.listdir(self.mounttmp)
- self.assertEqual(["file1.txt"], d1)
- with open(os.path.join(self.mounttmp, "file1.txt")) as f:
- self.assertEqual("plnp", f.read())
+ self.pool.apply(fuseModifyFileTestHelperReadEndContents, (self.mounttmp,))
+
class FuseAddFileToCollectionTest(MountTestBase):
def runTest(self):
d1 = llfuse.listdir(self.mounttmp)
self.assertEqual(["file1.txt", "file2.txt"], sorted(d1))
+
class FuseRemoveFileFromCollectionTest(MountTestBase):
def runTest(self):
collection = arvados.collection.Collection(api_client=self.api)
d1 = llfuse.listdir(self.mounttmp)
self.assertEqual(["file1.txt"], d1)
+
+def fuseCreateFileTestHelper(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ with open(os.path.join(mounttmp, "file1.txt"), "w") as f:
+ pass
+ Test().runTest()
+
class FuseCreateFileTest(MountTestBase):
def runTest(self):
collection = arvados.collection.Collection(api_client=self.api)
self.assertNotIn("file1.txt", collection)
- with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f:
- pass
+ self.pool.apply(fuseCreateFileTestHelper, (self.mounttmp,))
self.assertIn("file1.txt", collection)
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A[a-f0-9]{40}@[a-f0-9]{8} 0:0:file1\.txt$')
+ r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:file1\.txt$')
+
-def fuseWriteFileTestHelper(mounttmp):
+def fuseWriteFileTestHelperWriteFile(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ with open(os.path.join(mounttmp, "file1.txt"), "w") as f:
+ f.write("Hello world!")
+ Test().runTest()
+
+def fuseWriteFileTestHelperReadFile(mounttmp):
class Test(unittest.TestCase):
def runTest(self):
with open(os.path.join(mounttmp, "file1.txt"), "r") as f:
class FuseWriteFileTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
self.assertNotIn("file1.txt", collection)
- with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f:
- f.write("Hello world!")
+ self.pool.apply(fuseWriteFileTestHelperWriteFile, (self.mounttmp,))
with collection.open("file1.txt") as f:
self.assertEqual(f.read(), "Hello world!")
- # We can't just open the collection for reading because the underlying
- # C implementation of open() makes a fstat() syscall with the GIL still
- # held. When the GETATTR message comes back to llfuse (which in these
- # tests is in the same interpreter process) it can't acquire the GIL,
- # so it can't service the fstat() call, so it deadlocks. The
- # workaround is to run some of our test code in a separate process.
- # Forturnately the multiprocessing module makes this relatively easy.
- pool = multiprocessing.Pool(1)
- pool.apply(fuseWriteFileTestHelper, (self.mounttmp,))
- pool.close()
+ self.pool.apply(fuseWriteFileTestHelperReadFile, (self.mounttmp,))
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
-def fuseUpdateFileTestHelper1(mounttmp):
+
+def fuseUpdateFileTestHelper(mounttmp):
class Test(unittest.TestCase):
def runTest(self):
+ with open(os.path.join(mounttmp, "file1.txt"), "w") as f:
+ f.write("Hello world!")
+
with open(os.path.join(mounttmp, "file1.txt"), "r+") as f:
fr = f.read()
self.assertEqual(fr, "Hello world!")
f.seek(0)
fr = f.read()
self.assertEqual(fr, "Hola mundo!!")
- return True
- Test().runTest()
-def fuseUpdateFileTestHelper2(mounttmp):
- class Test(unittest.TestCase):
- def runTest(self):
with open(os.path.join(mounttmp, "file1.txt"), "r") as f:
- return f.read() == "Hola mundo!!"
+ self.assertEqual(f.read(), "Hola mundo!!")
+
Test().runTest()
class FuseUpdateFileTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
m.new_collection(collection.api_response(), collection)
self.assertTrue(m.writable())
- with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f:
- f.write("Hello world!")
-
- # See note in FuseWriteFileTest
- pool = multiprocessing.Pool(1)
- pool.apply(fuseUpdateFileTestHelper1, (self.mounttmp,))
- pool.apply(fuseUpdateFileTestHelper2, (self.mounttmp,))
- pool.close()
+ # See note in MountTestBase.setUp
+ self.pool.apply(fuseUpdateFileTestHelper, (self.mounttmp,))
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A[a-f0-9]{40}@[a-f0-9]{8} 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:11:file1\.txt 22:1:file1\.txt$')
+ r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A\S+ 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:11:file1\.txt 22:1:file1\.txt$')
+def fuseMkdirTestHelper(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ with self.assertRaises(IOError):
+ with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f:
+ f.write("Hello world!")
+
+ os.mkdir(os.path.join(mounttmp, "testdir"))
+
+ with self.assertRaises(OSError):
+ os.mkdir(os.path.join(mounttmp, "testdir"))
+
+ d1 = llfuse.listdir(mounttmp)
+ self.assertEqual(["testdir"], d1)
+
+ with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f:
+ f.write("Hello world!")
+
+ d1 = llfuse.listdir(os.path.join(mounttmp, "testdir"))
+ self.assertEqual(["file1.txt"], d1)
+
+ Test().runTest()
+
class FuseMkdirTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
m.new_collection(collection.api_response(), collection)
self.assertTrue(m.writable())
- with self.assertRaises(IOError):
- with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f:
+ self.pool.apply(fuseMkdirTestHelper, (self.mounttmp,))
+
+ collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
+ self.assertRegexpMatches(collection2["manifest_text"],
+ r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
+
+
+def fuseRmTestHelperWriteFile(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ os.mkdir(os.path.join(mounttmp, "testdir"))
+
+ with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f:
f.write("Hello world!")
- os.mkdir(os.path.join(self.mounttmp, "testdir"))
+ Test().runTest()
- with self.assertRaises(OSError):
- os.mkdir(os.path.join(self.mounttmp, "testdir"))
+def fuseRmTestHelperDeleteFile(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ # Can't delete because it's not empty
+ with self.assertRaises(OSError):
+ os.rmdir(os.path.join(mounttmp, "testdir"))
- d1 = llfuse.listdir(self.mounttmp)
- self.assertEqual(["testdir"], d1)
+ d1 = llfuse.listdir(os.path.join(mounttmp, "testdir"))
+ self.assertEqual(["file1.txt"], d1)
- with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f:
- f.write("Hello world!")
+ # Delete file
+ os.remove(os.path.join(mounttmp, "testdir", "file1.txt"))
- d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir"))
- self.assertEqual(["file1.txt"], d1)
+ # Make sure it's empty
+ d1 = llfuse.listdir(os.path.join(mounttmp, "testdir"))
+ self.assertEqual([], d1)
- collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
- self.assertRegexpMatches(collection2["manifest_text"],
- r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ # Try to delete it again
+ with self.assertRaises(OSError):
+ os.remove(os.path.join(mounttmp, "testdir", "file1.txt"))
+
+ Test().runTest()
+
+def fuseRmTestHelperRmdir(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ # Should be able to delete now that it is empty
+ os.rmdir(os.path.join(mounttmp, "testdir"))
+
+ # Make sure it's empty
+ d1 = llfuse.listdir(os.path.join(mounttmp))
+ self.assertEqual([], d1)
+ # Try to delete it again
+ with self.assertRaises(OSError):
+ os.rmdir(os.path.join(mounttmp, "testdir"))
+
+ Test().runTest()
class FuseRmTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
m.new_collection(collection.api_response(), collection)
self.assertTrue(m.writable())
- os.mkdir(os.path.join(self.mounttmp, "testdir"))
-
- with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f:
- f.write("Hello world!")
+ self.pool.apply(fuseRmTestHelperWriteFile, (self.mounttmp,))
# Starting manifest
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
+ self.pool.apply(fuseRmTestHelperDeleteFile, (self.mounttmp,))
- # Can't delete because it's not empty
- with self.assertRaises(OSError):
- os.rmdir(os.path.join(self.mounttmp, "testdir"))
+ # Can't have empty directories :-( so manifest will be empty.
+ collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
+ self.assertEqual(collection2["manifest_text"], "")
- d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir"))
- self.assertEqual(["file1.txt"], d1)
+ self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,))
- # Delete file
- os.remove(os.path.join(self.mounttmp, "testdir", "file1.txt"))
+ # manifest should be empty now.
+ collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
+ self.assertEqual(collection2["manifest_text"], "")
- # Make sure it's empty
- d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir"))
- self.assertEqual([], d1)
- # Try to delete it again
- with self.assertRaises(OSError):
- os.remove(os.path.join(self.mounttmp, "testdir", "file1.txt"))
+def fuseMvFileTestHelperWriteFile(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ os.mkdir(os.path.join(mounttmp, "testdir"))
- # Can't have empty directories :-( so manifest will be empty.
- collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
- self.assertEqual(collection2["manifest_text"], "")
+ with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f:
+ f.write("Hello world!")
- # Should be able to delete now that it is empty
- os.rmdir(os.path.join(self.mounttmp, "testdir"))
+ Test().runTest()
- # Make sure it's empty
- d1 = llfuse.listdir(os.path.join(self.mounttmp))
- self.assertEqual([], d1)
+def fuseMvFileTestHelperMoveFile(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ d1 = llfuse.listdir(os.path.join(mounttmp))
+ self.assertEqual(["testdir"], d1)
+ d1 = llfuse.listdir(os.path.join(mounttmp, "testdir"))
+ self.assertEqual(["file1.txt"], d1)
- # Try to delete it again
- with self.assertRaises(OSError):
- os.rmdir(os.path.join(self.mounttmp, "testdir"))
+ os.rename(os.path.join(mounttmp, "testdir", "file1.txt"), os.path.join(mounttmp, "file1.txt"))
- # manifest should be empty now.
- collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
- self.assertEqual(collection2["manifest_text"], "")
+ d1 = llfuse.listdir(os.path.join(mounttmp))
+ self.assertEqual(["file1.txt", "testdir"], sorted(d1))
+ d1 = llfuse.listdir(os.path.join(mounttmp, "testdir"))
+ self.assertEqual([], d1)
+ Test().runTest()
class FuseMvFileTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
m.new_collection(collection.api_response(), collection)
self.assertTrue(m.writable())
- os.mkdir(os.path.join(self.mounttmp, "testdir"))
-
- with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f:
- f.write("Hello world!")
+ self.pool.apply(fuseMvFileTestHelperWriteFile, (self.mounttmp,))
# Starting manifest
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
-
- d1 = llfuse.listdir(os.path.join(self.mounttmp))
- self.assertEqual(["testdir"], d1)
- d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir"))
- self.assertEqual(["file1.txt"], d1)
-
- os.rename(os.path.join(self.mounttmp, "testdir", "file1.txt"), os.path.join(self.mounttmp, "file1.txt"))
+ r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
- d1 = llfuse.listdir(os.path.join(self.mounttmp))
- self.assertEqual(["file1.txt", "testdir"], sorted(d1))
- d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir"))
- self.assertEqual([], d1)
+ self.pool.apply(fuseMvFileTestHelperMoveFile, (self.mounttmp,))
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
+
+
+def fuseRenameTestHelper(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ os.mkdir(os.path.join(mounttmp, "testdir"))
+
+ with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f:
+ f.write("Hello world!")
+ Test().runTest()
class FuseRenameTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
m.new_collection(collection.api_response(), collection)
self.assertTrue(m.writable())
- os.mkdir(os.path.join(self.mounttmp, "testdir"))
-
- with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f:
- f.write("Hello world!")
+ self.pool.apply(fuseRenameTestHelper, (self.mounttmp,))
# Starting manifest
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
d1 = llfuse.listdir(os.path.join(self.mounttmp))
self.assertEqual(["testdir"], d1)
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
- r'\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$')
+ r'\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
class FuseUpdateFromEventTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
def fuseFileConflictTestHelper(mounttmp):
class Test(unittest.TestCase):
def runTest(self):
+ with open(os.path.join(mounttmp, "file1.txt"), "w") as f:
+ f.write("bar")
+
d1 = sorted(llfuse.listdir(os.path.join(mounttmp)))
self.assertEqual(len(d1), 2)
self.assertEqual(f.read(), "bar")
self.assertRegexpMatches(d1[1],
- r'file1\.txt~conflict-\d\d\d\d-\d\d-\d\d-\d\d:\d\d:\d\d~')
+ r'file1\.txt~\d\d\d\d\d\d\d\d-\d\d\d\d\d\d~conflict~')
with open(os.path.join(mounttmp, d1[1]), "r") as f:
self.assertEqual(f.read(), "foo")
class FuseFileConflictTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
with collection2.open("file1.txt", "w") as f:
f.write("foo")
- with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f:
- f.write("bar")
-
- # See comment in FuseWriteFileTest
- pool = multiprocessing.Pool(1)
- pool.apply(fuseFileConflictTestHelper, (self.mounttmp,))
- pool.close()
+ # See note in MountTestBase.setUp
+ self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp,))
def fuseUnlinkOpenFileTest(mounttmp):
class FuseUnlinkOpenFileTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection = arvados.collection.Collection(api_client=self.api)
collection.save_new()
with llfuse.lock:
m.new_collection(collection.api_response(), collection)
- # See comment in FuseWriteFileTest
- pool = multiprocessing.Pool(1)
- pool.apply(fuseUnlinkOpenFileTest, (self.mounttmp,))
- pool.close()
+ # See note in MountTestBase.setUp
+ self.pool.apply(fuseUnlinkOpenFileTest, (self.mounttmp,))
self.assertEqual(collection.manifest_text(), "")
class FuseMvFileBetweenCollectionsTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection1 = arvados.collection.Collection(api_client=self.api)
collection1.save_new()
m = self.make_mount(fuse.MagicDirectory)
- # See comment in FuseWriteFileTest
- pool = multiprocessing.Pool(1)
- pool.apply(fuseMvFileBetweenCollectionsTest1, (self.mounttmp,
+ # See note in MountTestBase.setUp
+ self.pool.apply(fuseMvFileBetweenCollectionsTest1, (self.mounttmp,
collection1.manifest_locator(),
collection2.manifest_locator()))
collection1.update()
collection2.update()
- self.assertRegexpMatches(collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$")
+ self.assertRegexpMatches(collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$")
self.assertEqual(collection2.manifest_text(), "")
- pool.apply(fuseMvFileBetweenCollectionsTest2, (self.mounttmp,
+ self.pool.apply(fuseMvFileBetweenCollectionsTest2, (self.mounttmp,
collection1.manifest_locator(),
collection2.manifest_locator()))
- pool.close()
collection1.update()
collection2.update()
self.assertEqual(collection1.manifest_text(), "")
- self.assertRegexpMatches(collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file2\.txt$")
+ self.assertRegexpMatches(collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$")
+
+ collection1.stop_threads()
+ collection2.stop_threads()
def fuseMvDirBetweenCollectionsTest1(mounttmp, uuid1, uuid2):
Test().runTest()
+
def fuseMvDirBetweenCollectionsTest2(mounttmp, uuid1, uuid2):
class Test(unittest.TestCase):
def runTest(self):
d1 = os.listdir(os.path.join(mounttmp, uuid2, "testdir2"))
self.assertEqual(["file1.txt"], sorted(d1))
+ with open(os.path.join(mounttmp, uuid2, "testdir2", "file1.txt"), "r") as f:
+ self.assertEqual(f.read(), "Hello world!")
+
Test().runTest()
class FuseMvDirBetweenCollectionsTest(MountTestBase):
def runTest(self):
- arvados.logger.setLevel(logging.DEBUG)
-
collection1 = arvados.collection.Collection(api_client=self.api)
collection1.save_new()
m = self.make_mount(fuse.MagicDirectory)
- # See comment in FuseWriteFileTest
- pool = multiprocessing.Pool(1)
- pool.apply(fuseMvDirBetweenCollectionsTest1, (self.mounttmp,
+ # See note in MountTestBase.setUp
+ self.pool.apply(fuseMvDirBetweenCollectionsTest1, (self.mounttmp,
collection1.manifest_locator(),
collection2.manifest_locator()))
collection1.update()
collection2.update()
- self.assertRegexpMatches(collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$")
+ self.assertRegexpMatches(collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$")
self.assertEqual(collection2.manifest_text(), "")
- pool.apply(fuseMvDirBetweenCollectionsTest2, (self.mounttmp,
+ self.pool.apply(fuseMvDirBetweenCollectionsTest2, (self.mounttmp,
collection1.manifest_locator(),
collection2.manifest_locator()))
- pool.close()
collection1.update()
collection2.update()
self.assertEqual(collection1.manifest_text(), "")
- self.assertRegexpMatches(collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$")
+ self.assertRegexpMatches(collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$")
+
+ collection1.stop_threads()
+ collection2.stop_threads()
+
+def fuseProjectMkdirTestHelper1(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ os.mkdir(os.path.join(mounttmp, "testcollection"))
+ with self.assertRaises(OSError):
+ os.mkdir(os.path.join(mounttmp, "testcollection"))
+ Test().runTest()
+
+def fuseProjectMkdirTestHelper2(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ with open(os.path.join(mounttmp, "testcollection", "file1.txt"), "w") as f:
+ f.write("Hello world!")
+ with self.assertRaises(OSError):
+ os.rmdir(os.path.join(mounttmp, "testcollection"))
+ os.remove(os.path.join(mounttmp, "testcollection", "file1.txt"))
+ with self.assertRaises(OSError):
+ os.remove(os.path.join(mounttmp, "testcollection"))
+ os.rmdir(os.path.join(mounttmp, "testcollection"))
+ Test().runTest()
+
+class FuseProjectMkdirRmdirTest(MountTestBase):
+ def runTest(self):
+ self.make_mount(fuse.ProjectDirectory,
+ project_object=self.api.users().current().execute())
+
+ d1 = llfuse.listdir(self.mounttmp)
+ self.assertNotIn('testcollection', d1)
+
+ self.pool.apply(fuseProjectMkdirTestHelper1, (self.mounttmp,))
+
+ d1 = llfuse.listdir(self.mounttmp)
+ self.assertIn('testcollection', d1)
+
+ self.pool.apply(fuseProjectMkdirTestHelper2, (self.mounttmp,))
+
+ d1 = llfuse.listdir(self.mounttmp)
+ self.assertNotIn('testcollection', d1)
+
+
+def fuseProjectMvTestHelper1(mounttmp):
+ class Test(unittest.TestCase):
+ def runTest(self):
+ d1 = llfuse.listdir(mounttmp)
+ self.assertNotIn('testcollection', d1)
+
+ os.mkdir(os.path.join(mounttmp, "testcollection"))
+
+ d1 = llfuse.listdir(mounttmp)
+ self.assertIn('testcollection', d1)
+
+ with self.assertRaises(OSError):
+ os.rename(os.path.join(mounttmp, "testcollection"), os.path.join(mounttmp, 'Unrestricted public data'))
+
+ os.rename(os.path.join(mounttmp, "testcollection"), os.path.join(mounttmp, 'Unrestricted public data', 'testcollection'))
+
+ d1 = llfuse.listdir(mounttmp)
+ self.assertNotIn('testcollection', d1)
+
+ d1 = llfuse.listdir(os.path.join(mounttmp, 'Unrestricted public data'))
+ self.assertIn('testcollection', d1)
+
+ Test().runTest()
+
+class FuseProjectMvTest(MountTestBase):
+ def runTest(self):
+ self.make_mount(fuse.ProjectDirectory,
+ project_object=self.api.users().current().execute())
+
+ self.pool.apply(fuseProjectMvTestHelper1, (self.mounttmp,))
class FuseUnitTest(unittest.TestCase):
projects / arvados.git / blobdiff