From 3b030e393df89733905dda8fee24336f8d3f430c Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Thu, 3 Apr 2014 11:34:28 -0500 Subject: [PATCH] adjust the dns tests so they stop failing also, remove eli-tester use since I got bit, yet one more time, by the "syntax error on both sides of the => implies the test case passes" behavior. --- pkgs/net-pkgs/net-test/tests/net/dns.rkt | 49 ++++++++++++------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/net-pkgs/net-test/tests/net/dns.rkt b/pkgs/net-pkgs/net-test/tests/net/dns.rkt index bba5d59ed3..5e49f678ca 100644 --- a/pkgs/net-pkgs/net-test/tests/net/dns.rkt +++ b/pkgs/net-pkgs/net-test/tests/net/dns.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require net/dns tests/eli-tester) +(require net/dns rackunit) ;; internal tests @@ -64,45 +64,46 @@ (parse-reply '(0 187 129 128) mx-response-with-cname)) (define (internal-tests) - (test (ip->in-addr.arpa (ipv4 (bytes 8 8 8 8))) - => "8.8.8.8.in-addr.arpa" - (ip->in-addr.arpa (ipv4 (bytes 127 0 0 1))) - => "1.0.0.127.in-addr.arpa" - (ip->ip6.arpa (make-ip-address "4321:0:1:2:3:4:567:89ab")) - => (string-append "b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0" - ".2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.arpa") - (ip->ip6.arpa (make-ip-address "2001:db8::567:89ab")) - => (string-append "b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0" - ".0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa") + (check-equal? (ip->in-addr.arpa (ipv4 (bytes 8 8 8 8))) + "8.8.8.8.in-addr.arpa") + (check-equal? (ip->in-addr.arpa (ipv4 (bytes 127 0 0 1))) + "1.0.0.127.in-addr.arpa") + (check-equal? (ip->ip6.arpa (make-ip-address "4321:0:1:2:3:4:567:89ab")) + (string-append "b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0" + ".2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.arpa")) + (check-equal? (ip->ip6.arpa (make-ip-address "2001:db8::567:89ab")) + (string-append "b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0" + ".0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa")) ;; FIXME: may need to change if SOA handling in net/dns ;; changes (see FIXME there) - (parse-mx-response mx-ans mx-nss mx-response-with-cname "stat.ethz.ch") - => "stat.ethz.ch")) + (check-equal? (parse-mx-response mx-ans mx-nss mx-response-with-cname "stat.ethz.ch") + "stat.ethz.ch")) ;; Constants for testing. These can go out of sync ;; when server setups change, so keep them up-to-date. (define *google-dns* "8.8.8.8") (define *google-dns-2* "8.8.4.4") -(define *racket-url* "racket-lang.org") +(define *nwu-url* "eecs.northwestern.edu") +(define *nwu-ip* "129.105.8.227") (define *racket-host* "winooski.ccs.neu.edu") (define *racket-ip* "129.10.115.117") -(define *racket-mx* "aspmx.l.google.com") +(define *nwu-mx* "cuda.eecs.northwestern.edu") (define *kame-url* "www.kame.net") (define *kame-ip* "2001:200:dff:fff1:216:3eff:feb1:44d7") (define (nameserver-tests nameserver) - (test (dns-get-address nameserver *racket-url*) => *racket-ip* - (dns-get-address nameserver *racket-host*) => *racket-ip* - (dns-get-address nameserver *kame-url* #:ipv6? #t) => *kame-ip* - (dns-get-name nameserver *racket-ip*) => *racket-host* - (dns-get-mail-exchanger nameserver *racket-url*) => *racket-mx*)) + (check-equal? (dns-get-address nameserver *nwu-url*) *nwu-ip*) + (check-equal? (dns-get-address nameserver *racket-host*) *racket-ip*) + (check-equal? (dns-get-address nameserver *kame-url* #:ipv6? #t) *kame-ip*) + (check-equal? (dns-get-name nameserver *racket-ip*) *racket-host*) + (check-equal? (dns-get-mail-exchanger nameserver *nwu-url*) *nwu-mx*)) (provide tests) (module+ main (tests)) (define (tests) - (test do (internal-tests) - (nameserver-tests *google-dns*) - (nameserver-tests *google-dns-2*) - (let ([ns (dns-find-nameserver)]) (when ns (nameserver-tests ns))))) + (internal-tests) + (nameserver-tests *google-dns*) + (nameserver-tests *google-dns-2*) + (let ([ns (dns-find-nameserver)]) (when ns (nameserver-tests ns)))) (module+ test (require (submod ".." main))) ; for raco test & drdr