X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/03eee1573c7301b038306d6b6a1272c710317ef4..d49403ac749fffe24ac6357597e6014bb65efa30:/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 eb9a71fac9..73ef2475b9 100644
--- a/sdk/python/tests/test_arv_get.py
+++ b/sdk/python/tests/test_arv_get.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import
 from future.utils import listitems
 import io
+import logging
 import mock
 import os
 import re
@@ -30,7 +31,14 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
         self.tempdir = tempfile.mkdtemp()
         self.col_loc, self.col_pdh, self.col_manifest = self.write_test_collection()
 
+        self.stdout = tutil.BytesIO()
+        self.stderr = tutil.StringIO()
+        self.loggingHandler = logging.StreamHandler(self.stderr)
+        self.loggingHandler.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
+        logging.getLogger().addHandler(self.loggingHandler)
+
     def tearDown(self):
+        logging.getLogger().removeHandler(self.loggingHandler)
         super(ArvadosGetTestCase, self).tearDown()
         shutil.rmtree(self.tempdir)
 
@@ -41,19 +49,24 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
                                   'bar.txt' : 'bar',
                                   'subdir/baz.txt' : 'baz',
                               }):
-        c = collection.Collection()
+        api = arvados.api()
+        c = collection.Collection(api_client=api)
         for path, data in listitems(contents):
             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))
 
     def run_get(self, args):
-        self.stdout = tutil.BytesIO()
-        self.stderr = tutil.StringIO()
+        self.stdout.seek(0, 0)
+        self.stdout.truncate(0)
+        self.stderr.seek(0, 0)
+        self.stderr.truncate(0)
         return arv_get.main(args, self.stdout, self.stderr)
 
     def test_version_argument(self):
@@ -73,6 +86,13 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
         self.assertEqual(0, r)
         self.assertEqual(b'baz', self.stdout.getvalue())
 
+    def test_get_block(self):
+        # Get raw data using a block locator
+        blk = re.search(' (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())
+
     def test_get_multiple_files(self):
         # Download the entire collection to the temp directory
         r = self.run_get(["{}/".format(self.col_loc), self.tempdir])
@@ -153,24 +173,39 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers,
         tmpdir = self.make_tmpdir()
         # Simulate a TTY stderr
         stderr = mock.MagicMock()
-        stderr.isatty.return_value = True
         stdout = tutil.BytesIO()
+
         # Confirm that progress is written to stderr when is a tty
+        stderr.isatty.return_value = True
         r = arv_get.main(['{}/bigfile.txt'.format(c.manifest_locator()),
                           '{}/bigfile.txt'.format(tmpdir)],
                          stdout, stderr)
         self.assertEqual(0, r)
         self.assertEqual(b'', stdout.getvalue())
         self.assertTrue(stderr.write.called)
+
         # Clean up and reset stderr mock
         os.remove('{}/bigfile.txt'.format(tmpdir))
         stderr = mock.MagicMock()
-        stderr.isatty.return_value = False
         stdout = tutil.BytesIO()
+
         # Confirm that progress is not written to stderr when isn't a tty
+        stderr.isatty.return_value = False
         r = arv_get.main(['{}/bigfile.txt'.format(c.manifest_locator()),
                           '{}/bigfile.txt'.format(tmpdir)],
                          stdout, stderr)
         self.assertEqual(0, r)
         self.assertEqual(b'', stdout.getvalue())
         self.assertFalse(stderr.write.called)
+
+    request_id_regex = r'INFO: X-Request-Id: req-[a-z0-9]{20}\n'
+
+    def test_request_id_logging_on(self):
+        r = self.run_get(["-v", "{}/".format(self.col_loc), self.tempdir])
+        self.assertEqual(0, r)
+        self.assertRegex(self.stderr.getvalue(), self.request_id_regex)
+
+    def test_request_id_logging_off(self):
+        r = self.run_get(["{}/".format(self.col_loc), self.tempdir])
+        self.assertEqual(0, r)
+        self.assertNotRegex(self.stderr.getvalue(), self.request_id_regex)