Strip whitespace when checking query results in TAP tests

Author: svenklemm

test/perl/TimescaleNode.pm

@@ -56,4 +56,19 @@ sub psql_is
 		"$testname: psql output check");
 }
 
+# remove leading and trailing whitespace
+sub strip
+{
+  my ($self, $str) = @_;
+	$str =~ s/^\s+|\s+$//g;
+  return $str;
+}
+
+sub safe_psql
+{
+  my ($self, $db, $query) = @_;
+  my $psql_out = $self->SUPER::safe_psql($db, $query);
+  return $self->strip($psql_out);
+}
+
 1;

tsl/test/t/001_job_crash_log.pl

@@ -38,7 +38,7 @@ END
 my $query_add =
   q[select add_job('custom_proc_sleep60', '5 minutes', initial_start => now())];
 my $jobid = $node->safe_psql('postgres', "$query_add");
-is($jobid, '1000', 'job was added');
+is($jobid, 1000, 'job was added');
 
 my $query_pid_exists = <<"END_OF_QUERY";
 select count(*) from pg_stat_activity

tsl/test/t/004_truncate_or_delete_spin_lock.pl

@@ -27,15 +27,14 @@
 	temperature double precision null);
 	}
 );
-is($result, '', 'create table');
 
 # Create hypertable
 $result = $node->safe_psql(
 	'postgres', q{
-   SELECT FROM create_hypertable('sensor_data','time', chunk_time_interval => INTERVAL '1 month');
+   SELECT table_name FROM create_hypertable('sensor_data','time', chunk_time_interval => INTERVAL '1 month');
 	}
 );
-is($result, '', 'create hypertable');
+is($result, 'sensor_data', 'create hypertable');
 
 # Insert data
 $result = $node->safe_psql(
@@ -52,7 +51,6 @@
    ORDER BY time;
 	}
 );
-is($result, '', 'insert data');
 
 # Define count query
 my $count_query = "SELECT count(*) FROM sensor_data;";
@@ -72,7 +70,6 @@
    ALTER TABLE sensor_data SET (timescaledb.compress, timescaledb.compress_segmentby = 'sensor_id');
 	}
 );
-is($result, '', 'enable compression');
 
 # Get number of chunks
 my $n_chunks = $node->safe_psql(
@@ -87,7 +84,6 @@
 # SET session 1 behaviour to `truncate_or_delete`
 $result = $s1->query_safe(
 	"SET timescaledb.compress_truncate_behaviour TO truncate_or_delete;");
-isnt($result, '', "session 1: set truncate_or_delete");
 
 # Run tests
 
@@ -97,10 +93,8 @@
 
 # Begin txns in both sessions
 $result = $s1->query_safe("BEGIN");
-isnt($result, '', "session 1: begin");
 
 $result = $s2->query_safe("BEGIN");
-isnt($result, '', "session 2: begin");
 
 # The aggregation query takes an AccessShareLock on the chunk, preventing truncate
 $result = $s2->query_safe($count_query);
@@ -123,7 +117,6 @@
 is($result, $num_rows, "session 2: validate row count again");
 
 $result = $s2->query_safe("COMMIT");
-isnt($result, '', "session 2: commit");
 
 # No AccessExclusiveLock on the uncompressed chunk
 $result = $s1->query_safe(
@@ -134,7 +127,6 @@
 
 
 $result = $s1->query_safe("ROLLBACK");
-isnt($result, '', "session 1: rollback");
 
 ##########################################################################
 
@@ -143,10 +135,8 @@
 
 # Begin txns in both sessions
 $result = $s1->query_safe("BEGIN");
-isnt($result, '', "session 1: begin");
 
 $result = $s2->query_safe("BEGIN");
-isnt($result, '', "session 2: begin");
 
 $result = $s2->query_safe($count_query);
 is($result, $num_rows, "session 2: validate row count");
@@ -157,7 +147,6 @@
 
 # Session 2 immediately commits, releasing the AccessShareLock on the table
 $result = $s2->query_safe("COMMIT");
-isnt($result, '', "session 2: commit");
 
 # The result from the previous query_until() is returned with the next query
 # so perform a dummy query on s1 to discard the result
@@ -179,7 +168,6 @@
 is($result, $expected, "verify AccessExclusiveLock was taken");
 
 $result = $s1->query_safe("ROLLBACK");
-isnt($result, '', "session 1: rollback");
 
 $s1->quit();
 $s2->quit();