[ARVADOS] updated: 2.1.0-1276-g0f815282e

[Git user]

Summary of changes:
 services/fuse/tests/test_exec.py  | 1 +
 services/fuse/tests/test_mount.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  0f815282ed307b5cda9ab77a5343d3dc3c349bb1 (commit)
      from  025e6f91c13bdeb78585ce2c7a6d70c532eb8d7b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0f815282ed307b5cda9ab77a5343d3dc3c349bb1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 3 17:22:14 2021 -0400

    18078: Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/fuse/tests/test_exec.py b/services/fuse/tests/test_exec.py
index c90e7fd8d..6af60302b 100644
--- a/services/fuse/tests/test_exec.py
+++ b/services/fuse/tests/test_exec.py
@@ -21,6 +21,7 @@ except:
 
 def try_exec(mnt, cmd):
     try:
+        os.environ['KEEP_LOCAL_STORE'] = tempfile.mkdtemp()
         arvados_fuse.command.Mount(
             arvados_fuse.command.ArgumentParser().parse_args([
                 '--read-write',
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index e9343e783..157f55e4a 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -789,13 +789,13 @@ class FuseDeleteProjectEventTest(MountTestBase):
             attempt(self.assertEqual, [], llfuse.listdir(os.path.join(self.mounttmp, "aproject")))
 
 
-def fuseFileConflictTestHelper(mounttmp, uuid, keeptmp):
+def fuseFileConflictTestHelper(mounttmp, uuid, keeptmp, settings):
     class Test(unittest.TestCase):
         def runTest(self):
             os.environ['KEEP_LOCAL_STORE'] = keeptmp
 
             with open(os.path.join(mounttmp, "file1.txt"), "w") as f:
-                with arvados.collection.Collection(uuid) as collection2:
+                with arvados.collection.Collection(uuid, api_client=arvados.api_from_config('v1', apiconfig=settings)) as collection2:
                     with collection2.open("file1.txt", "w") as f2:
                         f2.write("foo")
                 f.write("bar")
@@ -827,7 +827,7 @@ class FuseFileConflictTest(MountTestBase):
         self.assertEqual([], sorted(d1))
 
         # See note in MountTestBase.setUp
-        self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp, collection.manifest_locator(), self.keeptmp))
+        self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp, collection.manifest_locator(), self.keeptmp, arvados.config.settings()))
 
 
 def fuseUnlinkOpenFileTest(mounttmp):

-----------------------------------------------------------------------


hooks/post-receive
--