projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18947-githttpd'
[arvados.git]
/
services
/
fuse
/
tests
/
performance
/
test_collection_performance.py
diff --git
a/services/fuse/tests/performance/test_collection_performance.py
b/services/fuse/tests/performance/test_collection_performance.py
index a975db52b0361ac92c2c42945fa15cd2b30b7a35..98bc98abd4cb2a9686f0e21d0bf514683bcde74a 100644
(file)
--- a/
services/fuse/tests/performance/test_collection_performance.py
+++ b/
services/fuse/tests/performance/test_collection_performance.py
@@
-1,3
+1,11
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+from __future__ import absolute_import
+from future.utils import viewitems
+from builtins import str
+from builtins import range
import arvados
import arvados_fuse as fuse
import llfuse
import arvados
import arvados_fuse as fuse
import llfuse
@@
-11,7
+19,7
@@
from ..slow_test import slow_test
logger = logging.getLogger('arvados.arv-mount')
logger = logging.getLogger('arvados.arv-mount')
-from performance_profiler import profiled
+from
.
performance_profiler import profiled
def fuse_createCollectionWithMultipleBlocks(mounttmp, streams=1, files_per_stream=1, data='x'):
class Test(unittest.TestCase):
def fuse_createCollectionWithMultipleBlocks(mounttmp, streams=1, files_per_stream=1, data='x'):
class Test(unittest.TestCase):
@@
-326,7
+334,7
@@
class UsingMagicDir_CreateCollectionWithManyFilesAndMoveAndDeleteFile(MountTestB
for j in range(0, files_per_stream):
files[os.path.join(self.mounttmp, collection, 'file'+str(j)+'.txt')] = data
for j in range(0, files_per_stream):
files[os.path.join(self.mounttmp, collection, 'file'+str(j)+'.txt')] = data
- for k, v in
files.items(
):
+ for k, v in
viewItems(files
):
with open(os.path.join(self.mounttmp, collection, k)) as f:
self.assertEqual(v, f.read())
with open(os.path.join(self.mounttmp, collection, k)) as f:
self.assertEqual(v, f.read())
@@
-464,10
+472,9
@@
class FuseListLargeProjectContents(MountTestBase):
project_contents = llfuse.listdir(self.mounttmp)
self.assertEqual(201, len(project_contents))
self.assertIn('Collection_1', project_contents)
project_contents = llfuse.listdir(self.mounttmp)
self.assertEqual(201, len(project_contents))
self.assertIn('Collection_1', project_contents)
- return project_contents
@profiled
@profiled
- def listContentsInProjectWithManyCollections(self
, project_contents
):
+ def listContentsInProjectWithManyCollections(self):
project_contents = llfuse.listdir(self.mounttmp)
self.assertEqual(201, len(project_contents))
self.assertIn('Collection_1', project_contents)
project_contents = llfuse.listdir(self.mounttmp)
self.assertEqual(201, len(project_contents))
self.assertIn('Collection_1', project_contents)
@@
-480,5
+487,5
@@
class FuseListLargeProjectContents(MountTestBase):
def test_listLargeProjectContents(self):
self.make_mount(fuse.ProjectDirectory,
project_object=run_test_server.fixture('groups')['project_with_201_collections'])
def test_listLargeProjectContents(self):
self.make_mount(fuse.ProjectDirectory,
project_object=run_test_server.fixture('groups')['project_with_201_collections'])
-
project_contents =
self.getProjectWithManyCollections()
- self.listContentsInProjectWithManyCollections(
project_contents
)
+ self.getProjectWithManyCollections()
+ self.listContentsInProjectWithManyCollections()