Merge pull request #1238 from martin-schulze-vireso/feature/modularize_tests2

WIP: Modularize more tests

test/default_relay_host.bats

@@ -21,6 +21,6 @@ function teardown() {
 #
 
 @test "checking default relay host: default relay host is added to main.cf" {
-  run docker exec mail_with_default_relay /bin/sh -c 'grep -e "^relayhost = default.relay.host.invalid:25" /etc/postfix/main.cf | wc -l | grep 1'
-  assert_success
+  run docker exec mail_with_default_relay /bin/sh -c 'grep -e "^relayhost =" /etc/postfix/main.cf'
+  assert_output 'relayhost = default.relay.host.invalid:25'
 }