arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some debug info for the script

Browse Source
This commit is contained in:
yinle 2014-05-08 08:02:30 -07:00
parent 854f6fde3b
commit 467d54c4a3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-test/restapitest
View File

@ -246,7 +246,7 @@ sub run_restapi
$cmd .= "'";
}
if($d) {
$cmd .= " --data '$d'";
$cmd .= " -H Content-Type:application/json --data '$d'";
}
$cmd .= " -D /tmp/err.log";
log_me("Begin to run restapi test with $cmd");
@ -394,17 +394,22 @@ sub check_result
my @expectvalue = split /:/, $expect; #@expectvalue = ANY, ANY, x86_64
$flag = 0;
foreach my $actual (@$actuals) { # $actual = nodetype:arch:x86_64
foreach my $expval (@expectvalue) { # $expval = ANY
foreach my $expval (@expectvalue) { # $expval = ANY
foreach my $actual (@$actuals) { # $actual = nodetype:arch:x86_64
if($flaghash{$actual} eq "none"){
next;
}
my @actualvalue = split /:/, $actual; # @actualvalue = nodetype, arch, x86_64
print_debug("begin to compare $expval and $actualvalue[$flag]");
if(($expval eq $actualvalue[$flag]) or ($expval eq "ANY")) { #ANY =~ nodetype
$flaghash{$actual} = "eq";
} elsif ($expval =~ $actualvalue[$flag] or $expval == "ANY") {
} elsif (($expval =~ $actualvalue[$flag]) or ($expval eq "ANY")) {
$flaghash{$actual} = "match";
} else {
$flaghash{$actual} = "none";
next;
}
print_debug(", compare result is $flaghash{$actual}\n");
}
$flag++;
}