bug fix for firewall rule deletion check in backwards compatibility tests on FreeBSD...
authorMichael Rash <mbr@cipherdyne.org>
Thu, 22 Nov 2012 02:29:26 +0000 (21:29 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 22 Nov 2012 02:29:26 +0000 (21:29 -0500)
test/test-fwknop.pl

index e52fc16..8b7cf3d 100755 (executable)
@@ -1404,7 +1404,7 @@ my @tests = (
             '9ptGrLs8kVGVludcXFy17opvThEYzTeaT7RVlCN66W/G9QZs9BBevEQ0xxI8eCn' .
             'KPDM+Bu9g0XwmCEVxxg+4jwBwtbCxVt9t5aSR29EVWZ6UAOwLkunK3t4FYBy1tL' .
             '55krFt+1B2TtNSAH005kyDEZEOIGoY9Q/iU',
-        'server_positive_output_matches' => [qr/Removed\srule/],
+        'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
@@ -1421,7 +1421,7 @@ my @tests = (
             '+uAD6hlS2BHuaCtVKIGyIsB/4U8USqcP9o4aT6FvBuPKORwTV8byyzv6bzZYINs4' .
             'Voq3QvBbIwkXJ63/oU+XxvP5R+DBLEnh3e/NHPFK6NB0WT2dujVyVxwBfvvWjIqW' .
             'Hhro2tH34nqfTRIpevfLTMx7r+N8ZQ4V8',
-        'server_positive_output_matches' => [qr/Removed\srule/],
+        'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
@@ -1438,7 +1438,7 @@ my @tests = (
             '+mS70t2A2YmV50KgwDyy6nYLwzQ7AUO8pA/eatm7g9xc83xy1z7VOXeAYrgAOWy' .
             'Ksk30QvkwHtPhl7I0oDz1bO+2K2JbDbyc0KBBzVNMLgJcuYgEpOXPkX2XhcTsgQ' .
             'Vw2/Va/aUjvEvNPtwuipQS6DLTzOw/qy+/g',
-        'server_positive_output_matches' => [qr/Removed\srule/],
+        'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
@@ -1454,7 +1454,7 @@ my @tests = (
             '+8OtxmTJPgQmrXZ7hAqTopLBC/thqHNuPHTfR234pFuQOCZUikPe0inHmjfnQFnP' .
             'Sop/Iy6v+BCn9D+QD7eT7JI6BIoKp14K+8iNgKaNw1BdfgF1XDulpkNEdyG0fXz5' .
             'M+GledHfz2d49aYThoQ2Cr8Iw1ycViawY',
-        'server_positive_output_matches' => [qr/Removed\srule/],
+        'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
@@ -1472,7 +1472,7 @@ my @tests = (
             'OI7d4QCsp14s8KJpW8qBzZ/n0aZCFCFdZnvdZeJJVboQu4jo' .
             'QFKZ8mmKwR/5DIO7k3qrXYGxYP0bnHYsih0HIE6CzSHlBGSf' .
             'DJR92YhjYtL4Q',
-        'server_positive_output_matches' => [qr/Removed\srule/],
+        'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'android_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",