From 50f435bd5a2700780e102b3afc8a62bf0435be14 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Thu, 16 Mar 2023 10:51:00 -0700
Subject: [PATCH] Fix s3 test errors

---
 .github/workflows/hls-tests.yml |  2 +-
 test/automated/hls/run-s3.sh    |  5 -----
 test/automated/hls/run.sh       | 21 ---------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/.github/workflows/hls-tests.yml b/.github/workflows/hls-tests.yml
index 2fabaefbe..a2f2cdfcf 100644
--- a/.github/workflows/hls-tests.yml
+++ b/.github/workflows/hls-tests.yml
@@ -16,7 +16,7 @@ env:
   S3_SECRET: ${{ secrets.S3_SECRET }}
 
 jobs:
-  hls:
+  tests:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/test/automated/hls/run-s3.sh b/test/automated/hls/run-s3.sh
index bd610da10..3f0f0349f 100644
--- a/test/automated/hls/run-s3.sh
+++ b/test/automated/hls/run-s3.sh
@@ -17,13 +17,8 @@ install_ffmpeg
 
 start_owncast
 
-start_stream
-
 sleep 10
 
-# Run tests against a fresh install with no settings.
-npm test
-
 # Update the server config to use S3 for storage.
 update_storage_config
 
diff --git a/test/automated/hls/run.sh b/test/automated/hls/run.sh
index 0b03ff64c..3170bcca4 100755
--- a/test/automated/hls/run.sh
+++ b/test/automated/hls/run.sh
@@ -17,24 +17,3 @@ sleep 10
 
 # Run tests against a fresh install with no settings.
 npm test
-
-# Kill the stream.
-kill_with_kids "$STREAM_PID"
-
-# Remove comments when #2615 is fixed.
-
-# Determine if we should continue testing with S3 configuration.
-# if [[ -z "${S3_BUCKET}" ]]; then
-# 	echo "No S3 configuration is set. Skipping S3 tests!"
-# 	exit 0
-# fi
-
-# # Update the server config to use S3 for storage.
-# update_storage_config
-
-# start_stream
-
-# sleep 10
-
-# # Re-run the HLS test against the external storage configuration.
-# npm test