[ARVADOS] created: 8cdcbf0a0355658b3026e63510dcbc6deded41c4

[Git user]

        at  8cdcbf0a0355658b3026e63510dcbc6deded41c4 (commit)


commit 8cdcbf0a0355658b3026e63510dcbc6deded41c4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 2 15:53:39 2016 -0400

    9929: Test case is more sensitive to mock return values

diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 21be5c7..d99a196 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -55,7 +55,7 @@ def stubs(func):
         {
             "uuid": "zzzzz-4zz18-zzzzzzzzzzzzzz5",
             "portable_data_hash": "99999999999999999999999999999995+99",
-            "manifest_text": ""
+            "manifest_text": ". 8bfd9d5a8dc1a71ab286283f9ff6fa20+153 0:153:cwl.input.json"
         }        )
         stubs.api.collections().get().execute.return_value = {
             "portable_data_hash": "99999999999999999999999999999993+99", "manifest_text": "./tool 00000000000000000000000000000000+0 0:0:submit_tool.cwl 0:0:blub.txt"}

commit a396a9ede35a43e23be8b8b687941aa8bc362784
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 2 13:22:50 2016 -0400

    9929: Portable_manifest_text() will not normalize manifest if it is otherwise
    unchanged.

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 56d8b23..dbf0425 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -888,13 +888,13 @@ class RichCollectionBase(CollectionBase):
         """Get the manifest text for this collection, sub collections and files.
 
         This method does not flush outstanding blocks to Keep.  It will return
-        a normalized manifest with access tokens stripped.
+        a manifest with access tokens stripped.
 
         :stream_name:
           Name to use for this stream (directory)
 
         """
-        return self._get_manifest_text(stream_name, True, True)
+        return self._get_manifest_text(stream_name, True, False)
 
     @synchronized
     def manifest_text(self, stream_name=".", strip=False, normalize=False):
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index cf8f23e..51bfe11 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -68,6 +68,7 @@ class ArvadosCollectionsTest(run_test_server.TestCaseWithServers,
         foobarbaz = self.write_foo_bar_baz()
         cr = arvados.CollectionReader(
             foobarbaz + '+Xzizzle', self.api_client)
+        self.assertEqual(foobarbaz, cr.portable_data_hash())
         got = []
         for s in cr.all_streams():
             for f in s.all_files():

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


hooks/post-receive
--