Skip to content

Commit

Permalink
[test suite] get resolve tests passing (--test mode stopped resolutions)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrash
mrash committed Dec 6, 2014
1 parent 01438a9 commit 5462581
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
4 changes: 4 additions & 0 deletions test/test-fwknop.pl
View file
Expand Up @@ -609,6 +609,10 @@
our $client_save_rc_args_no_force = "$default_client_args_no_get_key " .
"--rc-file $save_rc_file --save-rc-stanza --test";

our $client_save_rc_args_no_test = "$lib_view_str $valgrind_str " .
"$fwknopCmd -A tcp/22 -D $loopback_ip --no-save-args " .
"--rc-file $save_rc_file --save-rc-stanza --force-stanza -v -v -v";

our $server_rewrite_conf_files = "$lib_view_str $valgrind_str $fwknopdCmd " .
"-c $rewrite_fwknopd_conf -a $rewrite_access_conf " .
"-d $default_digest_file -p $default_pid_file $intf_str";
Expand Down
26 changes: 13 additions & 13 deletions test/tests/basic_operations.pl
View file
Expand Up @@ -1333,7 +1333,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve -u user agent',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R -u FwknopTestSuite/2.6",
'cmdline' => "$client_save_rc_args_no_test -n default -R -u FwknopTestSuite/2.6",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1345,7 +1345,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (1)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://www.cipherdyne.org/cgi-bin/myip",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://www.cipherdyne.org/cgi-bin/myip",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1357,7 +1357,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (2)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url www.cipherdyne.org/cgi-bin/myip",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url www.cipherdyne.org/cgi-bin/myip",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1369,7 +1369,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (3)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://127.0.0.1/",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://127.0.0.1/",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1382,7 +1382,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (4)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://127.0.0.1",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://127.0.0.1",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1395,7 +1395,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (5)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://www.cipherdyne.org/cgi-bin/myip",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://www.cipherdyne.org/cgi-bin/myip",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1407,7 +1407,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http (6)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url https://www.cipherdyne.org/cgi-bin/myip",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url https://www.cipherdyne.org/cgi-bin/myip",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1419,7 +1419,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve valid wget',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --wget-cmd wget",
'cmdline' => "$client_save_rc_args_no_test -n default -R --wget-cmd wget",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1431,7 +1431,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R wget user-agent',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --use-wget-user-agent",
'cmdline' => "$client_save_rc_args_no_test -n default -R --use-wget-user-agent",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1444,7 +1444,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve http only',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-http-only",
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-http-only",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1458,7 +1458,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve invalid wget',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --wget-cmd invalidpath",
'cmdline' => "$client_save_rc_args_no_test -n default -R --wget-cmd invalidpath",
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1472,7 +1472,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve invalid url (1)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://127.0.0.1" . '1'x300 . '/test.cgi',
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://127.0.0.1" . '1'x300 . '/test.cgi',
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand All @@ -1484,7 +1484,7 @@
'subcategory' => 'client save rc file',
'detail' => '-R resolve invalid url (2)',
'function' => \&client_rc_file,
'cmdline' => "$client_save_rc_args -n default -R --resolve-url http://127.0.0.1/" . 'A'x1200,
'cmdline' => "$client_save_rc_args_no_test -n default -R --resolve-url http://127.0.0.1/" . 'A'x1200,
'save_rc_stanza' => [{'name' => 'default',
'vars' => {'KEY' => 'testtest', 'HMAC_KEY' => 'hmactest',
'HMAC_DIGEST_TYPE' => 'SHA1'}}],
Expand Down

0 comments on commit 5462581

Please sign in to comment.