From a3dcce5253f085ba9bf5fece51f0c4fc3e10c9b0 Mon Sep 17 00:00:00 2001 From: Bozhao Date: Tue, 12 Jan 2021 19:01:31 -0800 Subject: [PATCH] [Fix] Failed uploading to GCS in e2e yatai service tests (#1401) * refactor upload_from_dir and update yatai services tests * Update bento_repository_api.py --- bentoml/yatai/client/bento_repository_api.py | 2 +- e2e_tests/yatai_server/test_sqlite_gcs.py | 4 +++- e2e_tests/yatai_server/test_sqlite_s3.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bentoml/yatai/client/bento_repository_api.py b/bentoml/yatai/client/bento_repository_api.py index bf9e98b330b..91cb6766112 100644 --- a/bentoml/yatai/client/bento_repository_api.py +++ b/bentoml/yatai/client/bento_repository_api.py @@ -205,7 +205,7 @@ def upload_from_dir(self, saved_bento_path, labels=None): http_response = requests.put( response.uri.s3_presigned_url, data=fileobj ) - elif response.uri.uri == BentoUri.GCS: + elif response.uri.type == BentoUri.GCS: http_response = requests.put( response.uri.gcs_presigned_url, data=fileobj ) diff --git a/e2e_tests/yatai_server/test_sqlite_gcs.py b/e2e_tests/yatai_server/test_sqlite_gcs.py index d420c5c5f0c..e4e91ef3507 100644 --- a/e2e_tests/yatai_server/test_sqlite_gcs.py +++ b/e2e_tests/yatai_server/test_sqlite_gcs.py @@ -33,7 +33,9 @@ def test_yatai_server_with_sqlite_and_gcs(): retrieve_svc_result = execute_bentoml_retrieve_command( f'{svc.name}:{svc.version}' ) - assert retrieve_svc_result.startswith(f'Service {svc.name} artifact directory') + assert retrieve_svc_result.startswith( + f'Save {svc.name}:{svc.version} artifact to directory' + ) logger.info('Validate BentoService prediction result') run_result = execute_bentoml_run_command(bento_tag, '[]') diff --git a/e2e_tests/yatai_server/test_sqlite_s3.py b/e2e_tests/yatai_server/test_sqlite_s3.py index cf9b62726e5..027d53fb516 100644 --- a/e2e_tests/yatai_server/test_sqlite_s3.py +++ b/e2e_tests/yatai_server/test_sqlite_s3.py @@ -36,7 +36,9 @@ def test_yatai_server_with_sqlite_and_s3(): retrieve_svc_result = execute_bentoml_retrieve_command( f'{svc.name}:{svc.version}' ) - assert retrieve_svc_result.startswith(f'Service {svc.name} artifact directory') + assert retrieve_svc_result.startswith( + f'Save {svc.name}:{svc.version} artifact to directory' + ) logger.info('Validate BentoService prediction result') run_result = execute_bentoml_run_command(bento_tag, '[]')