Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2021-09-28 18:48:02 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-10-07 16:47:32 +0300
commitafe78f95d1b0525da39b49a384551395f50d69c3 (patch)
tree58cbe68f219731ff6fe75d72553406d1058265c2
parentdc7d694f00eadd078a05991bff7c78cb29efeff4 (diff)
test: remove support for daemonize tests
-rw-r--r--test/acceptance/acceptance_test.go1
-rw-r--r--test/acceptance/helpers_test.go19
2 files changed, 0 insertions, 20 deletions
diff --git a/test/acceptance/acceptance_test.go b/test/acceptance/acceptance_test.go
index 9d0c0cd2..e6b50c10 100644
--- a/test/acceptance/acceptance_test.go
+++ b/test/acceptance/acceptance_test.go
@@ -16,7 +16,6 @@ const (
var (
pagesBinary = flag.String("gitlab-pages-binary", "../../gitlab-pages", "Path to the gitlab-pages binary")
- daemonize = flag.Bool("daemonize", false, "run tests as daemon")
httpPort = "36000"
httpsPort = "37000"
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go
index 8ad0166f..686504f5 100644
--- a/test/acceptance/helpers_test.go
+++ b/test/acceptance/helpers_test.go
@@ -351,7 +351,6 @@ func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraAr
args = append(args, "-metrics-address", promPort)
}
- args = append(args, getPagesDaemonArgs(t)...)
args = append(args, extraArgs...)
return
@@ -366,24 +365,6 @@ func contains(slice []string, s string) bool {
return false
}
-func getPagesDaemonArgs(t *testing.T) []string {
- if !(*daemonize) {
- return nil
- }
-
- if os.Geteuid() != 0 {
- t.Log("Privilege-dropping requested but not running as root!")
- t.FailNow()
- return nil
- }
-
- out := []string{}
-
- t.Log("Running pages as a daemon")
-
- return out
-}
-
// Does a HTTP(S) GET against the listener specified, setting a fake
// Host: and constructing the URL from the listener and the URL suffix.
func GetPageFromListener(t *testing.T, spec ListenSpec, host, urlsuffix string) (*http.Response, error) {