Merge branch '9964-output-glob-acr' refs #9964

[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 733cd6478c155131f9f29f4b3e7adedf6fa0508e..aefcbd7b22d319f43305686b505ba24e59aa110f 100644 (file)
--- a/sdk/python/tests/test_arv_get.py
+++ b/sdk/python/tests/test_arv_get.py
@@ -2,16 +2,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import absolute_import
-from future.utils import listitems
 import io
 import logging
-import mock
 import os
 import re
 import shutil
 import tempfile
 
+from unittest import mock
+
 import arvados
 import arvados.collection as collection
 import arvados.commands.get as arv_get
@@ -49,12 +48,15 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
                                   'bar.txt' : 'bar',
                                   'subdir/baz.txt' : 'baz',
                               }):
-        c = collection.Collection()
-        for path, data in listitems(contents):
+        api = arvados.api()
+        c = collection.Collection(api_client=api)
+        for path, data in contents.items():
             with c.open(path, 'wb') as f:
                 f.write(data)
         c.save_new()
 
+        api.close_connections()
+
         return (c.manifest_locator(),
                 c.portable_data_hash(),
                 c.manifest_text(strip=strip_manifest))
@@ -85,7 +87,7 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
 
     def test_get_block(self):
         # Get raw data using a block locator
-        blk = re.search(' (acbd18\S+\+A\S+) ', self.col_manifest).group(1)
+        blk = re.search(r' (acbd18\S+\+A\S+) ', self.col_manifest).group(1)
         r = self.run_get([blk, '-'])
         self.assertEqual(0, r)
         self.assertEqual(b'foo', self.stdout.getvalue())