Skip to content

Commit 3eaae69

Browse files
committed
TEST/MINOR: e2e: fix tests for debian
1 parent 69c02c8 commit 3eaae69

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ stages:
44
- e2e
55
variables:
66
DOCKER_HOST: tcp://docker:2375
7-
DOCKER_BASE_IMAGE: haproxytech/haproxy-debian
7+
DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-debian
88
BATS_VERSION: v1.4.1
99
GO_VERSION: '1.21'
1010

e2e/tests/process_manager/create.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ load 'utils/_helpers'
3030
resource_get "$_PROGRAMS_BASE_PATH/test"
3131
assert_equal "$SC" 200
3232
assert_equal "test" "$(get_json_path "$BODY" ".data.name")"
33-
assert_equal "nobody" "$(get_json_path "$BODY" ".data.user")"
34-
assert_equal "nobody" "$(get_json_path "$BODY" ".data.group")"
33+
assert_equal "haproxy" "$(get_json_path "$BODY" ".data.user")"
34+
assert_equal "haproxy" "$(get_json_path "$BODY" ".data.group")"
3535
}
3636

3737
@test "process-manager: Fail creating program with same name" {

e2e/tests/process_manager/data/program.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "test",
33
"command": "echo true",
44
"start-on-reload": "disabled",
5-
"user": "nobody",
6-
"group": "nobody"
5+
"user": "haproxy",
6+
"group": "haproxy"
77
}

e2e/tests/set_uid/test.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ teardown() {
6464
@test "set_uid: check if running user is testuiduser for dataplane" {
6565
PS=$(dpa_docker_exec "ps -eo ruser,user,comm | grep dataplaneapi")
6666
echo $PS
67-
[ "${PS}" = "testuidu testuidu dataplaneapi" ]
67+
[ "${PS}" = "testuid+ testuid+ dataplaneapi" ]
6868
}

0 commit comments

Comments
 (0)