From f249a1ac3ba47be834d72160bad76ffa42c32e1a Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Sun, 2 Mar 2025 15:33:45 +0100
Subject: [PATCH] consolidate test configuration

---
 acceptance/telemetry/test.toml                       | 11 +++++++++++
 acceptance/telemetry/upload-command/test.toml        | 10 ----------
 .../telemetry/upload-fails/out.upload_process.txt    |  2 +-
 acceptance/telemetry/upload-fails/test.toml          |  4 ++--
 .../telemetry/upload-partially-succeeds/test.toml    |  2 --
 acceptance/telemetry/upload-skipped/test.toml        | 10 ----------
 .../telemetry/upload-succeeds-integration/test.toml  |  9 +--------
 acceptance/telemetry/upload-succeeds-oauth/test.toml | 12 ------------
 acceptance/telemetry/upload-succeeds/test.toml       | 10 ----------
 9 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 acceptance/telemetry/upload-command/test.toml
 delete mode 100644 acceptance/telemetry/upload-skipped/test.toml
 delete mode 100644 acceptance/telemetry/upload-succeeds/test.toml

diff --git a/acceptance/telemetry/test.toml b/acceptance/telemetry/test.toml
index 3a2cae843..a7f8adeb3 100644
--- a/acceptance/telemetry/test.toml
+++ b/acceptance/telemetry/test.toml
@@ -1,4 +1,6 @@
 IncludeRequestHeaders = ["Authorization"]
+RecordRequests = true
+
 Local = true
 Cloud = false
 
@@ -13,3 +15,12 @@ New = '[OS]'
 [[Repls]]
 Old = 'execution_time_ms\\\":\d{1,5},'
 New = 'execution_time_ms\":\"SMALL_INT\",'
+
+[[Server]]
+Pattern = "POST /telemetry-ext"
+Response.Body = '''
+{
+    "errors": [],
+    "numProtoSuccess": 2
+}
+'''
diff --git a/acceptance/telemetry/upload-command/test.toml b/acceptance/telemetry/upload-command/test.toml
deleted file mode 100644
index cb29099c2..000000000
--- a/acceptance/telemetry/upload-command/test.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-RecordRequests = true
-
-[[Server]]
-Pattern = "POST /telemetry-ext"
-Response.Body = '''
-{
-    "errors": [],
-    "numProtoSuccess": 2
-}
-'''
diff --git a/acceptance/telemetry/upload-fails/out.upload_process.txt b/acceptance/telemetry/upload-fails/out.upload_process.txt
index fd804b280..e78f05b59 100644
--- a/acceptance/telemetry/upload-fails/out.upload_process.txt
+++ b/acceptance/telemetry/upload-fails/out.upload_process.txt
@@ -1 +1 @@
-error: upload did not succeed after three attempts. err: &retries.Err{Err:(*apierr.APIError)(0x140003a20a0), Halt:true}. response body: (*telemetry.ResponseBody)(nil)
+error: upload did not succeed after three attempts. err: &retries.Err{Err:(*apierr.APIError)(0x14000361540), Halt:true}. response body: (*telemetry.ResponseBody)(nil)
diff --git a/acceptance/telemetry/upload-fails/test.toml b/acceptance/telemetry/upload-fails/test.toml
index e86c6425f..e6ac68bd2 100644
--- a/acceptance/telemetry/upload-fails/test.toml
+++ b/acceptance/telemetry/upload-fails/test.toml
@@ -1,5 +1,3 @@
-RecordRequests = true
-
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
@@ -9,3 +7,5 @@ Response.Body = '''
 }
 '''
 Response.StatusCode = 501
+
+# TODO: Validate that this and the other tests have sane outputs.
diff --git a/acceptance/telemetry/upload-partially-succeeds/test.toml b/acceptance/telemetry/upload-partially-succeeds/test.toml
index 7f43da7d9..4e2bd9fab 100644
--- a/acceptance/telemetry/upload-partially-succeeds/test.toml
+++ b/acceptance/telemetry/upload-partially-succeeds/test.toml
@@ -1,5 +1,3 @@
-RecordRequests = true
-
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
diff --git a/acceptance/telemetry/upload-skipped/test.toml b/acceptance/telemetry/upload-skipped/test.toml
deleted file mode 100644
index cb29099c2..000000000
--- a/acceptance/telemetry/upload-skipped/test.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-RecordRequests = true
-
-[[Server]]
-Pattern = "POST /telemetry-ext"
-Response.Body = '''
-{
-    "errors": [],
-    "numProtoSuccess": 2
-}
-'''
diff --git a/acceptance/telemetry/upload-succeeds-integration/test.toml b/acceptance/telemetry/upload-succeeds-integration/test.toml
index 95bd2117d..fa4188ba4 100644
--- a/acceptance/telemetry/upload-succeeds-integration/test.toml
+++ b/acceptance/telemetry/upload-succeeds-integration/test.toml
@@ -4,11 +4,4 @@
 Local = true
 Cloud = true
 
-[[Server]]
-Pattern = "POST /telemetry-ext"
-Response.Body = '''
-{
-    "errors": [],
-    "numProtoSuccess": 2
-}
-'''
+RecordRequests = false
diff --git a/acceptance/telemetry/upload-succeeds-oauth/test.toml b/acceptance/telemetry/upload-succeeds-oauth/test.toml
index 9b3e009c0..2adade96a 100644
--- a/acceptance/telemetry/upload-succeeds-oauth/test.toml
+++ b/acceptance/telemetry/upload-succeeds-oauth/test.toml
@@ -1,15 +1,3 @@
-RecordRequests = true
-
-[[Server]]
-Pattern = "POST /telemetry-ext"
-Response.Body = '''
-{
-    "errors": [],
-    "numProtoSuccess": 2
-}
-'''
-
-
 # "client_id:client_secret" in base64 is Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=, expect to
 # see this in Authorization header
 [[Repls]]
diff --git a/acceptance/telemetry/upload-succeeds/test.toml b/acceptance/telemetry/upload-succeeds/test.toml
deleted file mode 100644
index cb29099c2..000000000
--- a/acceptance/telemetry/upload-succeeds/test.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-RecordRequests = true
-
-[[Server]]
-Pattern = "POST /telemetry-ext"
-Response.Body = '''
-{
-    "errors": [],
-    "numProtoSuccess": 2
-}
-'''