Skip to content

Commit 9aafc45

Browse files
authored
Merge pull request #1787 from drwetter/unittest_reorder
Unittest reorder
2 parents cc40d2f + 49d321c commit 9aafc45

8 files changed

Lines changed: 13 additions & 13 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ my $uri="google.com";
2020
my $socket_out="";
2121
my $openssl_out="";
2222
# Blacklists we use to trigger an error:
23-
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
24-
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
23+
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found';
24+
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found';
2525
my $json_regex_bl='(id".*:\s"scanProblem"|severity".*:\s"FATAL"|"Scan interrupted")';
2626

2727
my $socket_json="";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ my $uri="";
2020
my $socket_out="";
2121
my $openssl_out="";
2222
# Blacklists we use to trigger an error:
23-
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
24-
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
23+
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found';
24+
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found';
2525

2626
# my $socket_json="";
2727
# my $openssl_json="";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ my $uri="";
2323
my $socket_out="";
2424
my $openssl_out="";
2525
# Blacklists we use to trigger an error:
26-
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
27-
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
26+
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found';
27+
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found';
2828

2929
# my $socket_json="";
3030
# my $openssl_json="";

t/23_client_simulation.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ my $uri="";
1818
my $socket_out="";
1919
my $openssl_out="";
2020
# Blacklists we use to trigger an error:
21-
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
22-
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
21+
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found';
22+
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found';
2323

2424
# my $socket_json="";
2525
# my $openssl_json="";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ my $uri="";
1414
my $json="";
1515
my $out="";
1616
# Blacklists we use to trigger an error:
17-
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
18-
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
17+
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found';
18+
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found';
1919

2020
die "Unable to open $prg" unless -f $prg;
2121

File renamed without changes.

t/Readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### Naming scheme
22

33
* 00-05: Does the bare testssl.sh work at all?
4-
* 06-09: Does the reporting work at all?
5-
* 20-39: Do scans work fine (client side)?
4+
* 10-29: Do scans work fine (client side)?
5+
* 30-39: Does reporting work?
66
* 50-69: Are the results what I expect (server side)?
77

88
Please help to write Travis/CI tests! Documentation can be found [here](https://perldoc.perl.org/Test/More.html).
9-
You can consult the existing code here. Feel free to use `20_baseline_ipv4_http.t` or `23_client_simulation.t` as a
9+
You can consult the existing code here. Feel free to use `10_baseline_ipv4_http.t` or `23_client_simulation.t` as a
1010
template.

0 commit comments

Comments
 (0)