diff --git a/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm b/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm index 477cded..3eb502d 100644 --- a/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm +++ b/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm @@ -666,6 +666,9 @@ sub compare @sorted_filtered_body = sort { $a cmp $b } @filtered_body; } my $value = $path->value(\@sorted_filtered_body); + if (JSON::is_bool($value)) { + $value = $value ? 'true' : 'false'; + } if ($value !~ /$regex_expected_value/s) { print $log "$0::$subName INFO check failed:" @@ -709,6 +712,9 @@ sub compare #flatten the object into a string $json_field_val = dump($json_field_val); } + if (JSON::is_bool($json_field_val)) { + $json_field_val = $json_field_val ? 'true' : 'false'; + } my $regex_expected_value = $json_matches->{$key}; print $log "Comparing $key: $json_field_val with regex /$regex_expected_value/\n"; @@ -819,7 +825,7 @@ sub compare #first wait for job completion while ($NUM_RETRIES-- > 0) { $jobComplete = $res_hash->{'status'}->{'jobComplete'}; - if (defined $jobComplete && lc($jobComplete) eq "true") { + if (defined $jobComplete && (lc($jobComplete) eq "true" || lc($jobComplete) eq "1")) { last; } sleep $SLEEP_BETWEEN_RETRIES; @@ -827,7 +833,7 @@ sub compare $json = new JSON; $res_hash = $json->utf8->decode($jobResult->{'body'}); } - if ( (!defined $jobComplete) || lc($jobComplete) ne "true") { + if ( (!defined $jobComplete) || (lc($jobComplete) ne "true" && lc($jobComplete) ne "1")) print $log "$0::$subName WARN check failed: " . " timeout on wait for job completion "; $result = 0;