All unit tests consistent again!

This commit is contained in:
Frank Breedijk 2016-07-17 21:28:15 +02:00
parent 13b91498a3
commit a596001bf0
3 changed files with 6 additions and 6 deletions

View File

@ -10,12 +10,12 @@ my $tests = 0;
pass("Running openssl based client simulations against mozilla-old.badssl.com"); $tests++; pass("Running openssl based client simulations against mozilla-old.badssl.com"); $tests++;
my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-old.badssl.com`; my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-old.badssl.com`;
my $openssl = json('tmp.json'); my $openssl = json('tmp.json');
unlike($opensslout, qr/Running browser simulations via sockets/, "Tests didn't run via sockets"); $tests++; unlike($opensslout, qr/Running client simulations via sockets/, "Tests didn't run via sockets"); $tests++;
pass("Running socket based client simulations against mozilla-old.badssl.com"); $tests++; pass("Running socket based client simulations against mozilla-old.badssl.com"); $tests++;
my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-old.badssl.com`; my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-old.badssl.com`;
my $socket = json('tmp.json'); my $socket = json('tmp.json');
like($socketout, qr/Running browser simulations via sockets/, "Tests ran via sockets"); $tests++; like($socketout, qr/Running client simulations via sockets/, "Tests ran via sockets"); $tests++;
my $i = 0; my $i = 0;
foreach my $o ( @$openssl ) { foreach my $o ( @$openssl ) {

View File

@ -10,12 +10,12 @@ my $tests = 0;
pass("Running openssl based client simulations against mozilla-intermediate.badssl.com"); $tests++; pass("Running openssl based client simulations against mozilla-intermediate.badssl.com"); $tests++;
my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-intermediate.badssl.com`; my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-intermediate.badssl.com`;
my $openssl = json('tmp.json'); my $openssl = json('tmp.json');
unlike($opensslout, qr/Running browser simulations via sockets/, "Tests didn't run via sockets"); $tests++; unlike($opensslout, qr/Running client simulations via sockets/, "Tests didn't run via sockets"); $tests++;
pass("Running socket based client simulations against mozilla-intermediate.badssl.com"); $tests++; pass("Running socket based client simulations against mozilla-intermediate.badssl.com"); $tests++;
my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-intermediate.badssl.com`; my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-intermediate.badssl.com`;
my $socket = json('tmp.json'); my $socket = json('tmp.json');
like($socketout, qr/Running browser simulations via sockets/, "Tests ran via sockets"); $tests++; like($socketout, qr/Running client simulations via sockets/, "Tests ran via sockets"); $tests++;
my $i = 0; my $i = 0;
foreach my $o ( @$openssl ) { foreach my $o ( @$openssl ) {

View File

@ -10,12 +10,12 @@ my $tests = 0;
pass("Running openssl based client simulations against mozilla-modern.badssl.com"); $tests++; pass("Running openssl based client simulations against mozilla-modern.badssl.com"); $tests++;
my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-modern.badssl.com`; my $opensslout = `./testssl.sh -c --ssl-native --jsonfile tmp.json --color 0 mozilla-modern.badssl.com`;
my $openssl = json('tmp.json'); my $openssl = json('tmp.json');
unlike($opensslout, qr/Running browser simulations via sockets/, "Tests didn't run via sockets"); $tests++; unlike($opensslout, qr/Running client simulations via sockets/, "Tests didn't run via sockets"); $tests++;
pass("Running socket based client simulations against mozilla-modern.badssl.com"); $tests++; pass("Running socket based client simulations against mozilla-modern.badssl.com"); $tests++;
my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-modern.badssl.com`; my $socketout = `./testssl.sh -c --jsonfile tmp.json --color 0 mozilla-modern.badssl.com`;
my $socket = json('tmp.json'); my $socket = json('tmp.json');
like($socketout, qr/Running browser simulations via sockets/, "Tests ran via sockets"); $tests++; like($socketout, qr/Running client simulations via sockets/, "Tests ran via sockets"); $tests++;
my $i = 0; my $i = 0;
foreach my $o ( @$openssl ) { foreach my $o ( @$openssl ) {