projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7824: Merge branch 'master' into 7824-arvls-arvput-collection-api-usage
[arvados.git]
/
services
/
fuse
/
tests
/
test_mount.py
diff --git
a/services/fuse/tests/test_mount.py
b/services/fuse/tests/test_mount.py
index 4c70ce98d3d36bb2d28f77b3ad30a5bbfda42238..52d1e02b47edae0eb94b7eaf878e8b0357365c95 100644
(file)
--- a/
services/fuse/tests/test_mount.py
+++ b/
services/fuse/tests/test_mount.py
@@
-1,22
+1,15
@@
-import arvados
-import arvados.safeapi
-import arvados_fuse as fuse
-import glob
import json
import llfuse
import json
import llfuse
+import logging
+import mock
import os
import os
-import shutil
import subprocess
import subprocess
-import sys
-import tempfile
-import threading
import time
import unittest
import time
import unittest
-import logging
-import multiprocessing
+
+import arvados
+import arvados_fuse as fuse
import run_test_server
import run_test_server
-import mock
-import re
from mount_test_base import MountTestBase
from mount_test_base import MountTestBase
@@
-267,14
+260,22
@@
class FuseSharedTest(MountTestBase):
# check mtime on template
st = os.stat(pipeline_template_path)
# check mtime on template
st = os.stat(pipeline_template_path)
- self.assertEqual(st.st_mtime, 1397493304)
+ try:
+ mtime = st.st_mtime_ns / 1000000000
+ except AttributeError:
+ mtime = st.st_mtime
+ self.assertEqual(mtime, 1397493304)
# check mtime on collection
st = os.stat(os.path.join(
self.mounttmp,
'FUSE User',
'collection #1 owned by FUSE'))
# check mtime on collection
st = os.stat(os.path.join(
self.mounttmp,
'FUSE User',
'collection #1 owned by FUSE'))
- self.assertEqual(st.st_mtime, 1391448174)
+ try:
+ mtime = st.st_mtime_ns / 1000000000
+ except AttributeError:
+ mtime = st.st_mtime
+ self.assertEqual(mtime, 1391448174)
class FuseHomeTest(MountTestBase):
class FuseHomeTest(MountTestBase):