From 467d54c4a318666c1233d1166fe2b5b78798df65 Mon Sep 17 00:00:00 2001
From: yinle <yinle@cn.ibm.com>
Date: Thu, 8 May 2014 08:02:30 -0700
Subject: [PATCH] Add some debug info for the script

---
 xCAT-test/restapitest | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/xCAT-test/restapitest b/xCAT-test/restapitest
index 1307cd678..425ef7b2a 100755
--- a/xCAT-test/restapitest
+++ b/xCAT-test/restapitest
@@ -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++;
     }