From fac8be3c565869f5775ba48cbe10f0d3775a81e2 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Thu, 21 Aug 2025 19:50:05 +0000
Subject: [PATCH] chore: skip tests that require Forgejo if it is not available
 (#902)

<!--start release-notes-assistant-->
<!--URL:https://code.forgejo.org/forgejo/runner-->
- other
  - [PR](https://code.forgejo.org/forgejo/runner/pulls/902): <!--number 902 --><!--line 0 --><!--description Y2hvcmU6IHNraXAgdGVzdHMgdGhhdCByZXF1aXJlIEZvcmdlam8gaWYgaXQgaXMgbm90IGF2YWlsYWJsZQ==-->chore: skip tests that require Forgejo if it is not available<!--description-->
<!--end release-notes-assistant-->

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/902
Reviewed-by: Gusted <gusted@noreply.code.forgejo.org>
Reviewed-by: Mathieu Fenniak <mfenniak@noreply.code.forgejo.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
---
 internal/app/cmd/create-runner-file_test.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/internal/app/cmd/create-runner-file_test.go b/internal/app/cmd/create-runner-file_test.go
index cd0a720e..9da01ae1 100644
--- a/internal/app/cmd/create-runner-file_test.go
+++ b/internal/app/cmd/create-runner-file_test.go
@@ -37,12 +37,18 @@ func Test_uuidFromSecret(t *testing.T) {
 	assert.EqualValues(t, uuid, "41414141-4141-4141-4141-414141414141")
 }
 
-func Test_ping(t *testing.T) {
-	cfg := &config.Config{}
+func getForgejoFromEnv(t *testing.T) string {
+	t.Helper()
 	address := os.Getenv("FORGEJO_URL")
 	if address == "" {
-		address = "https://code.forgejo.org"
+		t.Skip("skipping because FORGEJO_URL is not set")
 	}
+	return address
+}
+
+func Test_ping(t *testing.T) {
+	cfg := &config.Config{}
+	address := getForgejoFromEnv(t)
 	reg := &config.Registration{
 		Address: address,
 		UUID:    "create-runner-file_test.go",
@@ -51,6 +57,8 @@ func Test_ping(t *testing.T) {
 }
 
 func Test_runCreateRunnerFile(t *testing.T) {
+	instance := getForgejoFromEnv(t)
+
 	//
 	// Set the .runner file to be in a temporary directory
 	//
@@ -63,10 +71,6 @@ func Test_runCreateRunnerFile(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, os.WriteFile(configFile, yamlData, 0o666))
 
-	instance, has := os.LookupEnv("FORGEJO_URL")
-	if !has {
-		instance = "https://code.forgejo.org"
-	}
 	secret, has := os.LookupEnv("FORGEJO_RUNNER_SECRET")
 	assert.True(t, has)
 	name := "testrunner"