Fixes for exim and divecot work
This commit is contained in:
@@ -339,10 +339,10 @@ function validate_web_domain() {
|
||||
run v-list-mail-account $userbk $domain testaccount
|
||||
assert_success
|
||||
# Check if alias is created
|
||||
assert_file_contains /etc/exim4/domains/$domain/aliases "testaccount@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/aliases "testaccount@$domain"
|
||||
# Check if expected rate limits are set
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "testaccount@$domain:20"
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "support@$domain:10"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "testaccount@$domain:20"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "support@$domain:10"
|
||||
}
|
||||
|
||||
@test "Restore[3]: From Hestia [DB]" {
|
||||
@@ -432,10 +432,10 @@ function validate_web_domain() {
|
||||
run v-list-mail-account $userbk $domain testaccount
|
||||
assert_success
|
||||
# Check if alias is created
|
||||
assert_file_contains /etc/exim4/domains/$domain/aliases "testaccount@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/aliases "testaccount@$domain"
|
||||
# Check if expected rate limits are set
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "testaccount@$domain:20"
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "support@$domain:10"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "testaccount@$domain:20"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "support@$domain:10"
|
||||
}
|
||||
|
||||
@test "Restore[4]: From Hestia [DB]" {
|
||||
|
||||
@@ -1610,7 +1610,7 @@ function check_ip_not_banned(){
|
||||
@test "MAIL: Add account" {
|
||||
run v-add-mail-account $user $domain test "$userpass2"
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "test@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@@ -1622,42 +1622,42 @@ function check_ip_not_banned(){
|
||||
@test "MAIL: Add account 2" {
|
||||
run v-add-mail-account $user $domain random "$userpass2"
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "random@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "random@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@test "MAIL: Add account alias" {
|
||||
run v-add-mail-account-alias $user $domain test hestiacprocks
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacprocks@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/aliases "hestiacprocks@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@test "MAIL: Add account alias 2" {
|
||||
run v-add-mail-account-alias $user $domain test hestiacprocks2
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacprocks2@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/aliases "hestiacprocks2@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@test "MAIL: Add account alias 3" {
|
||||
run v-add-mail-account-alias $user $domain test hestiacp
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacp@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/aliases "hestiacp@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@test "MAIL: Add account 3" {
|
||||
run v-add-mail-account $user $domain hestia "$userpass2"
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "hestia@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "hestia@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@test "MAIL: Add account 4" {
|
||||
run v-add-mail-account $user $domain hestiarocks3 "$userpass2"
|
||||
assert_success
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "hestiarocks3@$domain"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "hestiarocks3@$domain"
|
||||
refute_output
|
||||
}
|
||||
|
||||
@@ -1694,7 +1694,7 @@ function check_ip_not_banned(){
|
||||
|
||||
@test "MAIL: Change rate limit" {
|
||||
run v-change-mail-account-rate-limit $user $domain test 10
|
||||
assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain:10"
|
||||
assert_file_contains /etc/exim/domains/$domain/limits "test@$domain:10"
|
||||
}
|
||||
|
||||
@test "MAIL: Delete account" {
|
||||
@@ -2034,14 +2034,14 @@ function check_ip_not_banned(){
|
||||
run v-add-sys-smtp-relay $domain info@$domain 1234-test 587
|
||||
assert_success
|
||||
refute_output
|
||||
assert_file_exist /etc/exim4/smtp_relay.conf
|
||||
assert_file_exist /etc/exim/smtp_relay.conf
|
||||
}
|
||||
|
||||
@test "System: Delete SMTP relay" {
|
||||
run v-delete-sys-smtp-relay
|
||||
assert_success
|
||||
refute_output
|
||||
assert_file_not_exist /etc/exim4/smtp_relay.conf
|
||||
assert_file_not_exist /etc/exim/smtp_relay.conf
|
||||
}
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
||||
Reference in New Issue
Block a user