Skip to content

Commit 825e3e5

Browse files
committed
test: fix tests with using new compose naming scheme
1 parent 0a82b53 commit 825e3e5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/usr/bin/env bats
22

33
@test "Check postfix configuration" {
4-
run docker exec docker-mailserver_mta_1 postfix check
5-
4+
run docker exec docker-mailserver-mta-1 postfix check
5+
66
[ "$status" -eq 0 ]
77
[ "$output" = "" ]
88
}
99

1010
@test "Check dovecot configuration" {
11-
run docker exec docker-mailserver_mda_1 doveconf
11+
run docker exec docker-mailserver-mda-1 doveconf
1212

1313
[ "$status" -eq 0 ]
1414
}
1515

1616
@test "Check nginx configuration" {
17-
run docker exec docker-mailserver_web_1 nginx -t
17+
run docker exec docker-mailserver-web-1 nginx -t
1818

1919
[ "$status" -eq 0 ]
2020
}
2121

2222
@test "Check rspamd configuration" {
23-
run docker exec docker-mailserver_filter_1 rspamadm configtest
23+
run docker exec docker-mailserver-filter-1 rspamadm configtest
2424

2525
[ "$status" -eq 0 ]
2626
}

test/rootfs/usr/share/tests/070_docker.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
skip
1313
fi
1414

15-
run docker ps -q --filter name=docker-mailserver_virus_1
15+
run docker ps -q --filter name=docker-mailserver-virus-1
1616
[ "$status" -eq 0 ]
1717
[ "$output" = "" ]
1818
}
1919

2020
@test "Moved mail was sent to rspamd and learned successfully" {
21-
run bash -c "dockerlogs.sh docker-mailserver_filter_1 | grep 'learned message as spam: undef' | grep rspamd_controller_learn_fin_task"
21+
run bash -c "dockerlogs.sh docker-mailserver-filter-1 | grep 'learned message as spam: undef' | grep rspamd_controller_learn_fin_task"
2222

2323
[ "$status" -eq 0 ]
2424
}

0 commit comments

Comments
 (0)