Merge pull request #1826 from drwetter/fix_travis

Travis CI didn't run. Trying to fix it (3.1dev)

.travis.yml

@@ -8,11 +8,13 @@ addons:
     - dnsutils
     - jsonlint
 before_install:
-  - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)|(.pem)|(.pdf)|(.html)|^(LICENSE)|^(docs)|^(utils)|^(bin)|(Dockerfile)'
+  - |
+    echo "Checking if a CI run is needed post commit: ${TRAVIS_COMMIT_RANGE}"
+    if ! git diff --name-only ${TRAVIS_COMMIT_RANGE} | grep -qvE '(\.md$)|(\.pem$)|(\.pdf$)|(\.html$)|^(LICENSE)|^(docs)|^(utils)|^(bin)|(Dockerfile)'
     then
-      echo "no code was updated, not running the CI."
+      echo "No code was updated, not running the CI."
       exit
-  fi
+    fi
 install:
   - cpanm --notest Test::More
   - cpanm --notest Data::Dumper

t/61_diff_testsslsh.t

@@ -42,12 +42,16 @@ $diff = diff $socket_csv, $master_socket_csv;
 $socket_csv=`cat tmp.csv`;
 $master_socket_csv=`cat $master_socket_csv`;
 
-# Filter, for now only HTTP_clock_skew
+# Filter for changes that are allowed to occur
 $socket_csv=~ s/HTTP_clock_skew.*\n//g;
 $master_socket_csv=~ s/HTTP_clock_skew.*\n//g;
 
+# DROWN
+$socket_csv=~ s/censys.io.*\n//g;
+$master_socket_csv=~ s/censys.io.*\n//g;
+
+
 # Compare the differences to the master file -- and print differences if there were detected.
-# Filtering takes place later, so if there will be a difference detected it'll also show HTTP_clock_skew :-(
 #
 cmp_ok($socket_csv, "eq", $master_socket_csv, "Check whether CSV output matches master file from $uri") or
      diag ("\n%s\n", "$diff");