From 4201f4695f04578d64fddb383dd4dd44f4099652 Mon Sep 17 00:00:00 2001 From: Alek Westover Date: Fri, 23 Jun 2023 10:03:41 -0400 Subject: [PATCH] fix typo --- compute_tools/src/extension_server.rs | 5 ++--- test_runner/regress/test_download_extensions.py | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compute_tools/src/extension_server.rs b/compute_tools/src/extension_server.rs index 7253f1559d..4ee304f583 100644 --- a/compute_tools/src/extension_server.rs +++ b/compute_tools/src/extension_server.rs @@ -27,10 +27,9 @@ fn get_pg_version(pgbin: &str) -> String { // pg_config --version returns a (platform specific) human readable string // such as "PostgreSQL 15.4". We parse this to v14/v15 let human_version = get_pg_config("--version", pgbin); - if human_version.contains("v15") { + if human_version.contains("15") { return "v15".to_string(); - } - else if human_version.contains("v14") { + } else if human_version.contains("14") { return "v14".to_string(); } panic!("Unsuported postgres version {human_version}"); diff --git a/test_runner/regress/test_download_extensions.py b/test_runner/regress/test_download_extensions.py index 6f99821c61..833ab9dd65 100644 --- a/test_runner/regress/test_download_extensions.py +++ b/test_runner/regress/test_download_extensions.py @@ -16,7 +16,7 @@ TODO: - libs/remote_storage/src/s3_bucket.rs TODO // TODO: if bucket prefix is empty, the folder is prefixed with a "/" I think. Is this desired? -- Handle LIBRARY exttensions +- test LIBRARY exttensions - how to add env variable EXT_REMOTE_STORAGE_S3_BUCKET? """ @@ -32,7 +32,7 @@ relocatable = true""" @pytest.mark.parametrize( "remote_storage_kind", - [RemoteStorageKind.LOCAL_FS, RemoteStorageKind.MOCK_S3, RemoteStorageKind.REAL_S3], + [RemoteStorageKind.MOCK_S3], ) def test_file_download(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind): """ @@ -41,10 +41,7 @@ def test_file_download(neon_env_builder: NeonEnvBuilder, remote_storage_kind: Re Then, we download test_ext.control from the bucket to pg_install/v15/share/postgresql/extension/ Finally, we list available extensions and assert that test_ext is present """ - - if remote_storage_kind != RemoteStorageKind.MOCK_S3: - # skip these for now - return None + # RemoteStorageKind.REAL_S3, RemoteStorageKind.LOCAL_FS neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind,