mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-10 13:11:32 +00:00
Fixed a typo and added some regression tests
This commit is contained in:
@@ -5091,7 +5091,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4241,7 +4241,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3683,7 +3683,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4794,7 +4794,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4607,7 +4607,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3447,7 +3447,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3387,7 +3387,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4531,7 +4531,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6113,7 +6113,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6124,7 +6124,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -7146,7 +7146,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -7298,7 +7298,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -13228,7 +13228,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3796,7 +3796,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4419,7 +4419,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1348,7 +1348,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9527,7 +9527,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -11595,7 +11595,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4708,7 +4708,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -420,7 +420,7 @@ sub validate_options {
|
|||||||
chomp(@values);
|
chomp(@values);
|
||||||
|
|
||||||
return if grep { $value eq $_ } @values;
|
return if grep { $value eq $_ } @values;
|
||||||
$o->save_error("--version-check invalud value $value. Accepted values are "
|
$o->save_error("--version-check invalid value $value. Accepted values are "
|
||||||
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
. join(", ", @values[0..$#values-1]) . " and $values[-1]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -509,6 +509,23 @@ SKIP: {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# #############################################################################
|
||||||
|
# Check that the --v-c OPT validation works everywhere
|
||||||
|
# #############################################################################
|
||||||
|
|
||||||
|
for my $exec ( grep { slurp_file($_) =~ /package Pingback;/ }
|
||||||
|
grep { !/~/ }
|
||||||
|
glob("$trunk/bin/*")
|
||||||
|
)
|
||||||
|
{
|
||||||
|
my $output = `$exec --version-check ftp`;
|
||||||
|
like(
|
||||||
|
$output,
|
||||||
|
qr/\Q* --version-check invalid value ftp. Accepted values are https, http, auto and off/,
|
||||||
|
"Valid values for v-c are checked in $exec"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
# #############################################################################
|
# #############################################################################
|
||||||
# Done.
|
# Done.
|
||||||
# #############################################################################
|
# #############################################################################
|
||||||
|
Reference in New Issue
Block a user