From 152206211b4411e3e2d7af470fe7d5928bd07e76 Mon Sep 17 00:00:00 2001
From: Alek Westover <alek.westover@gmail.com>
Date: Thu, 22 Jun 2023 15:02:51 -0400
Subject: [PATCH] turn remote extensions off by default

---
 test_runner/fixtures/neon_fixtures.py         | 24 ++++++++++---------
 .../regress/test_download_extensions.py       |  5 +---
 test_runner/regress/test_timeline_delete.py   |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index 44c5eae793..2acf85c7b7 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -653,13 +653,14 @@ class NeonEnvBuilder:
         remote_storage_kind: RemoteStorageKind,
         test_name: str,
         force_enable: bool = True,
+        enable_remote_extensions: bool = False,
     ):
         if remote_storage_kind == RemoteStorageKind.NOOP:
             return
         elif remote_storage_kind == RemoteStorageKind.LOCAL_FS:
             self.enable_local_fs_remote_storage(force_enable=force_enable)
         elif remote_storage_kind == RemoteStorageKind.MOCK_S3:
-            self.enable_mock_s3_remote_storage(bucket_name=test_name, force_enable=force_enable)
+            self.enable_mock_s3_remote_storage(bucket_name=test_name, force_enable=force_enable, enable_remote_extensions=enable_remote_extensions)
         elif remote_storage_kind == RemoteStorageKind.REAL_S3:
             self.enable_real_s3_remote_storage(test_name=test_name, force_enable=force_enable)
         else:
@@ -675,7 +676,7 @@ class NeonEnvBuilder:
         assert force_enable or self.remote_storage is None, "remote storage is enabled already"
         self.remote_storage = LocalFsStorage(Path(self.repo_dir / "local_fs_remote_storage"))
 
-    def enable_mock_s3_remote_storage(self, bucket_name: str, force_enable: bool = True):
+    def enable_mock_s3_remote_storage(self, bucket_name: str, force_enable: bool = True, enable_remote_extensions: bool = False):
         """
         Sets up the pageserver to use the S3 mock server, creates the bucket, if it's not present already.
         Starts up the mock server, if that does not run yet.
@@ -704,15 +705,16 @@ class NeonEnvBuilder:
             secret_key=self.mock_s3_server.secret_key(),
         )
 
-        ext_bucket_name = f"ext_{bucket_name}"
-        self.remote_storage_client.create_bucket(Bucket=ext_bucket_name)
-        self.ext_remote_storage = S3Storage(
-            bucket_name=ext_bucket_name,
-            endpoint=mock_endpoint,
-            bucket_region=mock_region,
-            access_key=self.mock_s3_server.access_key(),
-            secret_key=self.mock_s3_server.secret_key(),
-        )
+        if enable_remote_extensions:
+            ext_bucket_name = f"ext_{bucket_name}"
+            self.remote_storage_client.create_bucket(Bucket=ext_bucket_name)
+            self.ext_remote_storage = S3Storage(
+                bucket_name=ext_bucket_name,
+                endpoint=mock_endpoint,
+                bucket_region=mock_region,
+                access_key=self.mock_s3_server.access_key(),
+                secret_key=self.mock_s3_server.secret_key(),
+            )
 
     def enable_real_s3_remote_storage(self, test_name: str, force_enable: bool = True):
         """
diff --git a/test_runner/regress/test_download_extensions.py b/test_runner/regress/test_download_extensions.py
index 8764e16fc9..2fa7a290a6 100644
--- a/test_runner/regress/test_download_extensions.py
+++ b/test_runner/regress/test_download_extensions.py
@@ -20,6 +20,7 @@ def test_file_download(neon_env_builder: NeonEnvBuilder):
     neon_env_builder.enable_remote_storage(
         remote_storage_kind=RemoteStorageKind.MOCK_S3,
         test_name="test_file_download",
+        use_ext_remote_storage=True,
     )
     neon_env_builder.num_safekeepers = 3
     env = neon_env_builder.init_start()
@@ -87,7 +88,3 @@ relocatable = true
             all_extensions = [x[0] for x in cur.fetchall()]
             log.info(all_extensions)
             assert "test_ext" in all_extensions
-
-    # TODO: we shouldn't need these...
-    endpoint.stop()
-    env.pageserver.http_client().tenant_detach(tenant)
diff --git a/test_runner/regress/test_timeline_delete.py b/test_runner/regress/test_timeline_delete.py
index 52260d2b71..6e8e3c1191 100644
--- a/test_runner/regress/test_timeline_delete.py
+++ b/test_runner/regress/test_timeline_delete.py
@@ -629,7 +629,7 @@ def test_timeline_delete_works_for_remote_smoke(
         )
 
     # for some reason the check above doesnt immediately take effect for the below.
-    # Assume it is mock server incosistency and check twice.
+    # Assume it is mock server inconsistency and check twice.
     wait_until(
         2,
         0.5,