remove 1 test

Stepan Pesternikov · Stepan Pesternikov · commit d3fb35f48a2c · 2017-03-09T17:17:52.000+03:00
diff --git a/test/perl/t/jobError.t b/test/perl/t/jobError.t
@@ -17,11 +17,7 @@ my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$passw
     {PrintError => 0});
 ok($dbh->err == 0) or (print $DBI::errstr and BAIL_OUT);
 
-my $query = "SELECT schedule.clean_log();";
-$dbh->do($query);
-ok($dbh->err == 0) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
-
-$query = "SELECT schedule.create_job(\'{ \"name\": \"Test\",
+my $query = "SELECT schedule.create_job(\'{ \"name\": \"Test\",
     \"cron\": \"* * * * *\",
     \"command\": \"aaaaaaaaaa;\",
     \"run_as\": \"tester\",
diff --git a/test/perl/t/jobLastStartAvailable.t b/test/perl/t/jobLastStartAvailable.t
@@ -54,6 +54,13 @@ ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 my $result = $sth->fetchrow_array() and $sth->finish();
 ok ($result == 0) or print "Count != 0\n";
 
+$query = "SELECT count(*) FROM schedule.get_log() WHERE cron = $job_id AND status = 'error'";
+$sth = $dbh->prepare($query);
+ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
+
+my $result = $sth->fetchrow_array() and $sth->finish();
+ok ($result > 0) or print "Count == 0\n";
+
 $query = "SELECT schedule.deactivate_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
diff --git a/test/perl/t/jobMaxInstances.t b/test/perl/t/jobMaxInstances.t
@@ -34,14 +34,15 @@ my $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
 my $job_id = $sth->fetchrow_array() and $sth->finish();
 
-sleep 120;
+sleep 180;
 $query = "SELECT schedule.deactivate_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute(), $dbh->errstr) or print $DBI::errstr . "\n";
 $sth->finish();
 
-$query = "SELECT message FROM schedule.get_log() WHERE cron=$job_id AND status=\'error\' ORDER BY cron DESC LIMIT 1";
+$query = "SELECT message FROM schedule.get_log()
+    WHERE cron=$job_id AND status=\'error\' AND message = 'max instances limit reached' LIMIT 1";
 my $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
 my $errorstr = $sth->fetchrow_array() and $sth->finish();
diff --git a/test/perl/t/jobMaxRunTime.t b/test/perl/t/jobMaxRunTime.t
@@ -24,7 +24,7 @@ ok($dbh->err == 0) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL
 $query = "SELECT schedule.create_job(\'{ \"name\": \"Test 1\",
     \"cron\": \"*/3 * * * *\",
     \"commands\": [\"SELECT pg_sleep(120)\",
-                    \"INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''createJob'')\"],
+                    \"INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''jobMaxRunTime'')\"],
     \"run_as\": \"tester\",
     \"use_same_transaction\": \"true\",
     \"max_run_time\":\"00:01:00\"
@@ -34,7 +34,7 @@ my $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
 my $job_id = $sth->fetchrow_array() and $sth->finish();
 
-sleep 250;
+sleep 180;
 $query = "SELECT count(*) FROM test_results";
 $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
@@ -48,7 +48,8 @@ $sth->bind_param(1, $job_id);
 ok($sth->execute(), $dbh->errstr) or print $DBI::errstr . "\n";
 $sth->finish();
 
-$query = "SELECT message FROM schedule.get_log() WHERE cron=$job_id AND status=\'error\' ORDER BY cron DESC LIMIT 1";
+$query = "SELECT message FROM schedule.get_log()
+    WHERE cron=$job_id AND status=\'error\' AND message = 'job timeout' LIMIT 1";
 my $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
 
diff --git a/test/perl/t/jobOnStart.t b/test/perl/t/jobOnStart.t
