Merge commit '359854ca4f01fcde4e129f73235fba8a2292fb8b' into PGPROEE9_6_scheduler

Vladimir Ershov · Vladimir Ershov · commit 4f1dd65f7087 · 2017-06-30T11:12:52.000+03:00
diff --git a/contrib/pgpro_scheduler/test/perl/runtest.pl b/contrib/pgpro_scheduler/test/perl/runtest.pl
@@ -65,9 +65,9 @@
 	"ALTER SYSTEM SET schedule.enabled = on",
 	"SELECT pg_reload_conf();",
 	"CREATE TABLE test_results( time_mark timestamp, commentary text )",
-	"DROP ROLE IF EXISTS tester",
-	"CREATE ROLE tester",
-	"GRANT INSERT ON test_results TO tester",
+	"DROP ROLE IF EXISTS _pgpro_tester",
+	"CREATE ROLE _pgpro_tester",
+	"GRANT INSERT ON test_results TO _pgpro_tester",
 );
 map { __do_sql($dbh, $_) } @sql2;
 $dbh->disconnect();
@@ -86,6 +86,7 @@
 );
 my $harness = TAP::Harness->new( \%args );
 my @tests = glob( 't/*.t' );
+### @tests = ('t/jobMaxRunTime.t');
 $harness->runtests(@tests );
 
 
diff --git a/contrib/pgpro_scheduler/test/perl/t/jobMaxRunTime.t b/contrib/pgpro_scheduler/test/perl/t/jobMaxRunTime.t
@@ -31,7 +31,7 @@ $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
 
 my $result = $sth->fetchrow_array() and $sth->finish();
-ok ($result == 0) or print "Count != 0\n";
+ok ($result == 0) or print "Count $result != 0\n";
 
 $query = "SELECT schedule.deactivate_job(?)";
 $sth = $dbh->prepare($query);
