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
path: root/test
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2021-08-19 08:48:26 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-08-20 04:39:10 +0300
commit26f3b1e4426d25e43f4f044c49bb53286430c784 (patch)
tree154211e2226f8c9cc9d11db1906b082283999d81 /test
parent118b921983e1f9309eca42e50375e993dcd4e98c (diff)
test: remove leftover tests requiring source disk
Diffstat (limited to 'test')
-rw-r--r--test/acceptance/config_test.go27
-rw-r--r--test/acceptance/serving_test.go36
2 files changed, 0 insertions, 63 deletions
diff --git a/test/acceptance/config_test.go b/test/acceptance/config_test.go
index 82b7fbb1..07697c48 100644
--- a/test/acceptance/config_test.go
+++ b/test/acceptance/config_test.go
@@ -5,7 +5,6 @@ import (
"net"
"net/http"
"testing"
- "time"
"github.com/stretchr/testify/require"
)
@@ -65,29 +64,3 @@ func TestMultipleListenersFromEnvironmentVariables(t *testing.T) {
require.Equal(t, http.StatusOK, rsp.StatusCode)
}
}
-
-// TODO: remove along chroot https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561
-func TestEnableJailFromEnvironment(t *testing.T) {
- out, teardown := runPagesProcess(t,
- true,
- *pagesBinary,
- []ListenSpec{httpListener},
- "",
- []string{
- "DAEMON_ENABLE_JAIL=true",
- },
- "-domain-config-source", "disk",
- )
- t.Cleanup(teardown)
-
- require.Eventually(t, func() bool {
- require.Contains(t, out.String(), "\"daemon-enable-jail\":true")
- return true
- }, time.Second, 10*time.Millisecond)
-
- rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com", "project/")
-
- require.NoError(t, err)
- rsp.Body.Close()
- require.Equal(t, http.StatusOK, rsp.StatusCode)
-}
diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go
index 238a05dd..b1682f9b 100644
--- a/test/acceptance/serving_test.go
+++ b/test/acceptance/serving_test.go
@@ -375,42 +375,6 @@ func TestDomainsSource(t *testing.T) {
apiCalled: true,
},
},
- {
- name: "disk_source_domain_exists",
- args: args{
- configSource: "disk",
- // test.domain.com sourced from disk configuration
- domain: "test.domain.com",
- urlSuffix: "/",
- },
- want: want{
- statusCode: http.StatusOK,
- content: "main-dir\n",
- apiCalled: false,
- },
- },
- {
- name: "disk_source_domain_does_not_exist",
- args: args{
- configSource: "disk",
- domain: "non-existent-domain.gitlab.io",
- },
- want: want{
- statusCode: http.StatusNotFound,
- apiCalled: false,
- },
- },
- {
- name: "disk_source_domain_should_not_exist_under_hashed_dir",
- args: args{
- configSource: "disk",
- domain: "hashed.com",
- },
- want: want{
- statusCode: http.StatusNotFound,
- apiCalled: false,
- },
- },
}
for _, tt := range tests {