Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-01-08 17:51:57 +00:00
Code Releases Activity

test: Replace dnsmasq with minidns

Browse Source 
This commit replaces test/t-14-tls_tracking usage of dnsmasq (an
external test dependency) with our new minidns.
This commit is contained in:
Alberto Bertogli
2018-11-28 09:50:44 +00:00
parent a0ae5fb41b
commit 57f5a09901
4 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/Dockerfile
View File

@@ -25,8 +25,7 @@ RUN apt-get install -y -q python3 msmtp
# Install the optional packages for the integration tests. # Install the optional packages for the integration tests.
RUN apt-get install -y -q \ RUN apt-get install -y -q \
gettext-base dovecot-imapd \ gettext-base dovecot-imapd \
exim4-daemon-light \ exim4-daemon-light
dnsmasq
# Prepare exim. # Prepare exim.
RUN mkdir -p test/t-02-exim/.exim4 \ RUN mkdir -p test/t-02-exim/.exim4 \

24
test/t-14-tls_tracking/dnsmasq.conf
View File

@@ -1,24 +0,0 @@
# Configuration for dnsmasq, for testing purposes.
interface=lo
port=9053
no-resolv
no-poll
no-hosts
log-queries
# Note we need both ipv4 and ipv6 A record because some test environments may
# not support one or the other.
# srv-a zone
address=/srv-a/::1
address=/srv-a/127.0.0.1
mx-host=srv-a,srv-a,10
txt-record=srv-a,"v=spf1 a"
# srv-b zone
address=/srv-b/::1
address=/srv-b/127.0.0.1
mx-host=srv-b,srv-b,10
txt-record=srv-b,"v=spf1 a"

12
test/t-14-tls_tracking/run.sh
View File

@@ -7,11 +7,6 @@ set -e
init init
if ! dnsmasq --version > /dev/null; then
skip "dnsmasq binary is not functional"
exit 0
fi
# To fake SPF we need to override the resolver, which is only supported in Go # To fake SPF we need to override the resolver, which is only supported in Go
# >= 1.8, so this test depends on that version. # >= 1.8, so this test depends on that version.
# TODO: remove this once we only support go >= 1.8. # TODO: remove this once we only support go >= 1.8.
@@ -25,11 +20,8 @@ fi
# Build with the DNS override, so we can fake DNS records. # Build with the DNS override, so we can fake DNS records.
export GOTAGS="dnsoverride" export GOTAGS="dnsoverride"
# Launch dnsmasq in the background using our configuration. # Launch minidns in the background using our configuration.
# We run with -d as it takes care of a lot of options (log file, pid file, minidns --addr=":9053" -zones=zones >> .minidns.log 2>&1 &
# etc.) for our use case.
# It listens on localhost:9053 as configuration.
dnsmasq --conf-file=dnsmasq.conf -d >> .dnsmasq.log 2>&1 &
# Two chasquid servers: # Two chasquid servers:

11
test/t-14-tls_tracking/zones Normal file
View File

@@ -0,0 +1,11 @@
# srv-a zone
srv-a A 127.0.0.1
srv-a AAAA ::1
srv-a MX srv-a
srv-a TXT v=spf1 a
# srv-b zone
srv-b A 127.0.0.1
srv-b AAAA ::1
srv-b MX srv-b
srv-b TXT v=spf1 a