[ARVADOS] updated: b257d006610748cb133c352f9ce95b61d1c66e17

[Git user]

Summary of changes:
 services/fuse/arvados_fuse/__init__.py |  6 +++---
 services/fuse/tests/test_mount.py      | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

       via  b257d006610748cb133c352f9ce95b61d1c66e17 (commit)
      from  e48fa087b669f02e57b8f209e1f2e1d56b85ba05 (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 b257d006610748cb133c352f9ce95b61d1c66e17
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 9 13:50:41 2016 -0500

    8345: Fix dirent timestamps.

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index f8a902d..f1853d2 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -433,9 +433,9 @@ class Operations(llfuse.Operations):
 
         entry.st_blksize = 512
         entry.st_blocks = (entry.st_size/512)+1
-        entry.st_atime_ns = int(e.atime())
-        entry.st_mtime_ns = int(e.mtime())
-        entry.st_ctime_ns = int(e.mtime())
+        entry.st_atime_ns = int(e.atime() * 1000000000)
+        entry.st_mtime_ns = int(e.mtime() * 1000000000)
+        entry.st_ctime_ns = int(e.mtime() * 1000000000)
 
         return entry
 
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 300e636..1a16e74 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -240,14 +240,22 @@ class FuseSharedTest(MountTestBase):
 
         # check mtime on template
         st = os.stat(pipeline_template_path)
-        self.assertEqual(st.st_mtime_ns, 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'))
-        self.assertEqual(st.st_mtime_ns, 1391448174)
+        try:
+            mtime = st.st_mtime_ns / 1000000000
+        except AttributeError:
+            mtime = st.st_mtime
+        self.assertEqual(mtime, 1391448174)
 
 
 class FuseHomeTest(MountTestBase):

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


hooks/post-receive
--