X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8363d828ffd8a190ba41b6b9d435a292a4a8f0a5..37044d922164855ba5cc443e775037ab12cdbf95:/sdk/python/tests/test_arv_keepdocker.py diff --git a/sdk/python/tests/test_arv_keepdocker.py b/sdk/python/tests/test_arv_keepdocker.py index 9ce096fb52..526fd68727 100644 --- a/sdk/python/tests/test_arv_keepdocker.py +++ b/sdk/python/tests/test_arv_keepdocker.py @@ -25,12 +25,12 @@ class StopTest(Exception): class ArvKeepdockerTestCase(unittest.TestCase, tutil.VersionChecker): - def run_arv_keepdocker(self, args, err): + def run_arv_keepdocker(self, args, err, **kwargs): sys.argv = ['arv-keepdocker'] + args log_handler = logging.StreamHandler(err) arv_keepdocker.logger.addHandler(log_handler) try: - return arv_keepdocker.main() + return arv_keepdocker.main(**kwargs) finally: arv_keepdocker.logger.removeHandler(log_handler) @@ -167,6 +167,21 @@ class ArvKeepdockerTestCase(unittest.TestCase, tutil.VersionChecker): self.run_arv_keepdocker(['[::1]:8888/repo/img:tag'], sys.stderr) find_image_mock.assert_called_with('[::1]:8888/repo/img', 'tag') + def test_list_images_with_host_and_port(self): + api = arvados.api('v1') + taglink = api.links().create(body={'link': { + 'link_class': 'docker_image_repo+tag', + 'name': 'registry.example:1234/repo:latest', + 'head_uuid': 'zzzzz-4zz18-1v45jub259sjjgb', + }}).execute() + try: + out = tutil.StringIO() + with self.assertRaises(SystemExit): + self.run_arv_keepdocker([], sys.stderr, stdout=out) + self.assertRegex(out.getvalue(), '\nregistry.example:1234/repo +latest ') + finally: + api.links().delete(uuid=taglink['uuid']).execute() + @mock.patch('arvados.commands.keepdocker.list_images_in_arv', return_value=[]) @mock.patch('arvados.commands.keepdocker.find_image_hashes',