From b85416b58dfade137e13d5fb250edf4f79a52aee Mon Sep 17 00:00:00 2001 From: Alek Westover Date: Thu, 22 Jun 2023 11:15:33 -0400 Subject: [PATCH] satisfying mypy --- test_runner/fixtures/neon_fixtures.py | 1 + test_runner/regress/test_download_extensions.py | 3 +++ test_runner/regress/test_timeline_delete.py | 1 + 3 files changed, 5 insertions(+) diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index 470f059d58..bd8cc754ed 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -798,6 +798,7 @@ class NeonEnvBuilder: # `self.remote_storage_prefix` is coupled with `S3Storage` storage type, # so this line effectively a no-op assert isinstance(self.remote_storage, S3Storage) + assert self.remote_storage_client is not None if self.keep_remote_storage_contents: log.info("keep_remote_storage_contents skipping remote storage cleanup") diff --git a/test_runner/regress/test_download_extensions.py b/test_runner/regress/test_download_extensions.py index dfe3114b1d..a52889287d 100644 --- a/test_runner/regress/test_download_extensions.py +++ b/test_runner/regress/test_download_extensions.py @@ -28,6 +28,9 @@ def test_file_download(neon_env_builder: NeonEnvBuilder): neon_env_builder.num_safekeepers = 3 env = neon_env_builder.init_start() + assert env.ext_remote_storage is not None + assert env.remote_storage_client is not None + TEST_EXT_PATH = "v14/share/postgresql/extension/test_ext.control" BUCKET_PREFIX = "5314225671" # this is a hash of the commit number diff --git a/test_runner/regress/test_timeline_delete.py b/test_runner/regress/test_timeline_delete.py index ddd9ffd755..52260d2b71 100644 --- a/test_runner/regress/test_timeline_delete.py +++ b/test_runner/regress/test_timeline_delete.py @@ -275,6 +275,7 @@ def assert_prefix_empty(neon_env_builder: NeonEnvBuilder, prefix: Optional[str] assert isinstance(neon_env_builder.remote_storage, S3Storage) # Note that this doesnt use pagination, so list is not guaranteed to be exhaustive. + assert neon_env_builder.remote_storage_client is not None response = neon_env_builder.remote_storage_client.list_objects_v2( Bucket=neon_env_builder.remote_storage.bucket_name, Prefix=prefix or neon_env_builder.remote_storage.prefix_in_bucket or "",