Merge pull request #321 from mboot-github/master

sync to dynamic tests

Author: maarten-boot

test3.py

@@ -0,0 +1,5 @@
+#! /usr/bin/env python3
+
+from whois.main import main
+
+main()

testAll.sh

@@ -12,4 +12,5 @@
 
 # all tld's that produce no output (None), we also show the raw try data
 
-./test2.py -a 2>2 | tee 1
+./test3.py -V | tee 1
+./test3.py -a 2>2 | tee -a 1

testdata/DOMAINS.txt

@@ -0,0 +1,11 @@
+example.com # has iana source
+example.net # has iana source
+example.org # has no iana source
+hello.xyz   # has sometimes IANA Source beginning on mac
+meta.co.jp  # jp has [registrar] type keywords not registrar:
+meta.com    # have emails
+meta.com.tr # has utf 8 response text and different formatting style
+meta.co.uk  # has multiline for all relevant fields and 4 nameservers; should be fixed output has only 2
+meta.jp     # jp has [registrar] type keywords not registrar:
+meta.kr     # has both korean and english text
+xs4all.nl   # has multiline nameserver and multiline registrar; outout has no nameservers should be 2

testdata/make_testdata.sh

@@ -1,31 +1,30 @@
 #! /usr/bin/bash
 
+WHERE=$( dirname $0 )
+
 getDomains()
 {
-    DOMAINS=(
-        example.net # has iana source
-        example.com # has iana source
-        example.org # has no iana source
-        meta.co.uk # has multiline for all relevant fields and 4 nameservers; should be fixed output has only 2
-        xs4all.nl # has multiline nameserver and multiline registrar; outout has no nameservers should be 2
-        meta.com.sg # has mail
-        meta.com # have emails
-        meta.jp # jp has [registrar] type keywords not registrar:
-        meta.co.jp # jp has [registrar] type keywords not registrar:
-        meta.kr # has both korean and english text
-        meta.com.tr # has utf 8 response text and different formatting style
-        hello.xyz # has sometimes IANA Source beginning on mac
-    )
+    cat DOMAINS.txt |
+    awk '
+    /^[ \t]*;/ { next }
+    /^[ \t]*#/ { next }
+    /^[ \t]*$/ { next }
+    { print $1 }
+    '
 }
 
 verifyNameservers()
 {
     local str="$1"
 
-    grep name_servers  "./$str/output" | awk '{ $1 = $2 = ""; print }' | awk -F, '{print NF}'
-    grep "name server" "./$str/nameservers" | wc -l
+    grep name_servers  "./$str/output" |
+    awk '{ $1 = $2 = ""; print }' |
+    awk -F, '{print NF}'
 
+    grep "name server" "./$str/nameservers" |
+    wc -l
 }
+
 makeDataForDomain()
 {
     local str="$1"
@@ -38,7 +37,7 @@ makeDataForDomain()
     tee "./$str/input"
 
     # dump the expected output as output
-    ../test2.py -d "$str" |
+    ../bin/test2.py -d "$str" |
     tee "./$str/output"
 
     # dump the nameservers via host
@@ -48,31 +47,23 @@ makeDataForDomain()
     # verifyNameservers "$str"
 }
 
-makeDataIfNotExist()
+main()
 {
-    for str in ${DOMAINS[@]}
-    do
-        [ -d "$str" ] && continue
-        makeDataForDomain "$str"
-    done
-}
+    local force="$1"
 
-makeDataIfExist()
-{
-    for str in ${DOMAINS[@]}
+    cd "${WHERE}"
+    getDomains |
+    while read str
     do
-        makeDataForDomain "$str"
-    done
-}
+        [ "$force" == "force" ] && {
+            makeDataForDomain "$str"
+            continue
+        }
 
-main()
-{
-    local force="$1"
-    getDomains
-    makeDataIfNotExist
-    [ "$force" == "force" ] && {
-        makeDataIfExist
-    }
+        [ ! -d "$str" ] && {
+            makeDataForDomain "$str"
+        }
+    done
 }
 
 main $*