at 34edd811f18e8c911847dbde7629a509f1fed750 (commit)
commit 34edd811f18e8c911847dbde7629a509f1fed750
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
--