Fix python SDK test suite issues.

[arvados.git] / sdk / python / test_mount.py

diff --git a/sdk/python/test_mount.py b/sdk/python/test_mount.py
index a462799899b83ea878f7e59a548cc75f2a67c29c..fd7348bb2b8b2c116f6d975c682dc6903884663c 100644 (file)
--- a/sdk/python/test_mount.py
+++ b/sdk/python/test_mount.py
@@ -163,7 +163,7 @@ class FuseTagsTest(MountTestBase):
 
     def runTest(self):
         run_test_server.authorize_with("admin")
-        api = arvados.api('v1')
+        api = arvados.api('v1', cache=False)
 
         operations = fuse.Operations(os.getuid(), os.getgid())
         e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api))
@@ -204,7 +204,7 @@ class FuseTagsUpdateTestBase(MountTestBase):
 
     def runRealTest(self):
         run_test_server.authorize_with("admin")
-        api = arvados.api('v1')
+        api = arvados.api('v1', cache=False)
 
         operations = fuse.Operations(os.getuid(), os.getgid())
         e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api, poll_time=1))
@@ -218,7 +218,7 @@ class FuseTagsUpdateTestBase(MountTestBase):
 
         d1 = os.listdir(self.mounttmp)
         d1.sort()
-        self.assertEqual(d1, ['foo_tag'])
+        self.assertEqual(['foo_tag'], d1)
 
         api.links().create(body={'link': {
             'head_uuid': 'fa7aeb5140e2848d39b416daeef4ffc5+45',
@@ -266,7 +266,7 @@ class FuseTagsUpdateTestWebsockets(FuseTagsUpdateTestBase):
         self.runRealTest()
 
     def tearDown(self):
-        run_test_server.stop(True)
+        run_test_server.stop()
         super(FuseTagsUpdateTestWebsockets, self).tearDown()
 
 
@@ -279,7 +279,7 @@ class FuseTagsUpdateTestPoll(FuseTagsUpdateTestBase):
         self.runRealTest()
 
     def tearDown(self):
-        run_test_server.stop(False)
+        run_test_server.stop()
         super(FuseTagsUpdateTestPoll, self).tearDown()
 
 
@@ -290,7 +290,7 @@ class FuseGroupsTest(MountTestBase):
 
     def runTest(self):
         run_test_server.authorize_with("admin")
-        api = arvados.api('v1')
+        api = arvados.api('v1', cache=False)
 
         operations = fuse.Operations(os.getuid(), os.getgid())
         e = operations.inodes.add_entry(fuse.GroupsDirectory(llfuse.ROOT_INODE, operations.inodes, api))
@@ -308,18 +308,19 @@ class FuseGroupsTest(MountTestBase):
 
         d2 = os.listdir(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso'))
         d2.sort()
-        self.assertEqual(["I'm a job in a folder",
+        self.assertEqual(['1f4b0bc7583c2a7f9102c395f4ffc5e3+45 added sometime',
+                          "I'm a job in a folder",
                           "I'm a template in a folder",
                           "zzzzz-j58dm-5gid26432uujf79",
                           "zzzzz-j58dm-7r18rnd5nzhg5yk",
+                          "zzzzz-j58dm-ypsjlol9dofwijz",
                           "zzzzz-j7d0g-axqo7eu9pwvna1x"
                       ], d2)
 
         d3 = os.listdir(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso', 'zzzzz-j7d0g-axqo7eu9pwvna1x'))
         d3.sort()
         self.assertEqual(["I'm in a subfolder, too",
-                          "zzzzz-j58dm-c40lddwcqqr1ffs",
-                          "zzzzz-o0j2j-ryhm1bn83ni03sn"
+                          "zzzzz-j58dm-c40lddwcqqr1ffs"
                       ], d3)
 
         with open(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso', "I'm a template in a folder")) as f: