[ARVADOS] updated: 9dbeb1f31dafd927495ede39c7653b095495da26

[Git user]

Summary of changes:
 sdk/python/arvados/collection.py  | 10 +++++-----
 services/fuse/tests/test_mount.py | 29 +++++++++--------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

       via  9dbeb1f31dafd927495ede39c7653b095495da26 (commit)
       via  60887cc6f720dcb67272acf1c2ed3ed66db0412e (commit)
       via  d9666e975ff53ad8bd09ec54fa3200aa8490d668 (commit)
      from  93e437b0dfd453f00df59c6a84bcc5d3ef09a9be (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 9dbeb1f31dafd927495ede39c7653b095495da26
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 1 11:36:35 2017 -0400

    11220: Avoid implying that manifests can be loaded from Keep.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 7b598fb..4be098d 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -1193,8 +1193,9 @@ class Collection(RichCollectionBase):
         """Collection constructor.
 
         :manifest_locator_or_text:
-          One of Arvados collection UUID, block locator of
-          a manifest, raw manifest text, or None (to create an empty collection).
+          An Arvados collection UUID, portable data hash, raw manifest
+          text, or (if creating an empty collection) None.
+
         :parent:
           the parent Collection, may be None.
 
@@ -1652,9 +1653,8 @@ class Subcollection(RichCollectionBase):
 class CollectionReader(Collection):
     """A read-only collection object.
 
-    Initialize from an api collection record locator, a portable data hash of a
-    manifest, or raw manifest text.  See `Collection` constructor for detailed
-    options.
+    Initialize from a collection UUID or portable data hash, or raw
+    manifest text.  See `Collection` constructor for detailed options.
 
     """
     def __init__(self, manifest_locator_or_text, *args, **kwargs):

commit 60887cc6f720dcb67272acf1c2ed3ed66db0412e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 1 11:31:31 2017 -0400

    11220: Fix test case for new API call sequence.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 19a1f52..63b1b32 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -128,7 +128,8 @@ class FuseMagicTest(MountTestBase):
 
         self.testcollection = cw.finish()
         self.test_manifest = cw.manifest_text()
-        self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
+        coll = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
+        self.test_manifest_pdh = coll['portable_data_hash']
 
     def runTest(self):
         self.make_mount(fuse.MagicDirectory)
@@ -1026,7 +1027,13 @@ class MagicDirApiError(FuseMagicTest):
     def setUp(self):
         api = mock.MagicMock()
         super(MagicDirApiError, self).setUp(api=api)
-        api.collections().get().execute.side_effect = iter([Exception('API fail'), {"manifest_text": self.test_manifest}])
+        api.collections().get().execute.side_effect = iter([
+            Exception('API fail'),
+            {
+                "manifest_text": self.test_manifest,
+                "portable_data_hash": self.test_manifest_pdh,
+            },
+        ])
         api.keep.get.side_effect = Exception('Keep fail')
 
     def runTest(self):

commit d9666e975ff53ad8bd09ec54fa3200aa8490d668
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 1 11:31:11 2017 -0400

    11220: Remove test for unsupported case.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index ec8868a..19a1f52 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -117,24 +117,6 @@ class FuseMountTest(MountTestBase):
                 self.assertEqual(v, f.read())
 
 
-class FuseNoAPITest(MountTestBase):
-    def setUp(self):
-        super(FuseNoAPITest, self).setUp()
-        keep = arvados.keep.KeepClient(local_store=self.keeptmp)
-        self.file_data = "API-free text\n"
-        self.file_loc = keep.put(self.file_data)
-        self.coll_loc = keep.put(". {} 0:{}:api-free.txt\n".format(
-                self.file_loc, len(self.file_data)))
-
-    def runTest(self):
-        self.make_mount(fuse.MagicDirectory)
-        self.assertDirContents(self.coll_loc, ['api-free.txt'])
-        with open(os.path.join(
-                self.mounttmp, self.coll_loc, 'api-free.txt')) as keep_file:
-            actual = keep_file.read(-1)
-        self.assertEqual(self.file_data, actual)
-
-
 class FuseMagicTest(MountTestBase):
     def setUp(self, api=None):
         super(FuseMagicTest, self).setUp(api=api)

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


hooks/post-receive
--