projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11209-crunch-unmount-all'
[arvados.git]
/
sdk
/
python
/
tests
/
test_arv_get.py
diff --git
a/sdk/python/tests/test_arv_get.py
b/sdk/python/tests/test_arv_get.py
index 907c671822b16ed0929f5976c0a0c0ad5f9b6eac..1dbff37452157872e695e27d7f8fb30bfd4cfa7c 100644
(file)
--- a/
sdk/python/tests/test_arv_get.py
+++ b/
sdk/python/tests/test_arv_get.py
@@
-26,6
+26,7
@@
class ArvadosGetTestCase(run_test_server.TestCaseWithServers):
shutil.rmtree(self.tempdir)
def write_test_collection(self,
shutil.rmtree(self.tempdir)
def write_test_collection(self,
+ strip_manifest=True,
contents = {
'foo.txt' : 'foo',
'bar.txt' : 'bar',
contents = {
'foo.txt' : 'foo',
'bar.txt' : 'bar',
@@
-36,7
+37,9
@@
class ArvadosGetTestCase(run_test_server.TestCaseWithServers):
with c.open(path, 'w') as f:
f.write(data)
c.save_new()
with c.open(path, 'w') as f:
f.write(data)
c.save_new()
- return (c.manifest_locator(), c.portable_data_hash(), c.manifest_text())
+ return (c.manifest_locator(),
+ c.portable_data_hash(),
+ c.manifest_text(strip=strip_manifest))
def run_get(self, args):
self.stdout = io.BytesIO()
def run_get(self, args):
self.stdout = io.BytesIO()
@@
-75,9
+78,9
@@
class ArvadosGetTestCase(run_test_server.TestCaseWithServers):
def test_get_collection_manifest(self):
# Get the collection manifest
def test_get_collection_manifest(self):
# Get the collection manifest
- r = self.run_get([self.col_
loc
, self.tempdir])
+ r = self.run_get([self.col_
pdh
, self.tempdir])
self.assertEqual(0, r)
self.assertEqual(0, r)
- with open("{}/{}".format(self.tempdir, self.col_
loc
), "r") as f:
+ with open("{}/{}".format(self.tempdir, self.col_
pdh
), "r") as f:
self.assertEqual(self.col_manifest, f.read())
def test_invalid_collection(self):
self.assertEqual(self.col_manifest, f.read())
def test_invalid_collection(self):