Merge branch 'master' of git.postgrespro.ru:pgpro-dba/pgpro_scheduler

Vladimir Ershov · Vladimir Ershov · commit 861c85ad10cc · 2017-03-07T16:20:16.000+03:00
diff --git a/test/perl/t/jobMaxInstances.t b/test/perl/t/jobMaxInstances.t
@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+use strict;
+no warnings;
+use Test::More;
+use DBI;
+use Getopt::Long;
+
+my $dbname;
+my $username;
+my $password;
+my $host;
+GetOptions ( "--host=s" => \$host,
+    "--dbname=s" => \$dbname,
+    "--username=s" => \$username,
+    "--password=s" => \$password);
+my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$password",
+    {PrintError => 0});
+ok($dbh->err == 0) or (print $DBI::errstr and BAIL_OUT);
+
+my $query = "DELETE FROM test_results;";
+$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 1\",
+    \"cron\": \"* * * * *\",
+    \"commands\": [\"SELECT pg_sleep(120)\",
+                    \"INSERT INTO test_results (time_mark, commentary) VALUES(now(), ''jobMaxInstances'')\"],
+    \"run_as\": \"tester\",
+    \"use_same_transaction\": \"true\",
+    \"max_instances\": 1
+    }\'
+    );";
+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;
+$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";
+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();
+ok($errorstr eq "max instances limit reached") or print $DBI::errstr . "\n";
+
+$query = "DELETE FROM test_results;";
+$dbh->do($query);
+ok($dbh->err == 0, $dbh->errstr) or print $DBI::errstr . "\n";
+
+$query = "SELECT schedule.drop_job(?)";
+$sth = $dbh->prepare($query);
+$sth->bind_param(1, $job_id);
+ok($sth->execute(), $dbh->errstr) or print $DBI::errstr . "\n";
+$sth->finish();
+
+$dbh->disconnect();
+
+done_testing();
+
diff --git a/test/perl/t/submitJobWithError.t b/test/perl/t/submitJobWithError.t
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+use strict;
+no warnings;
+use Test::More;
+use DBI;
+use Getopt::Long;
+
+my $dbname;
+my $username;
+my $password;
+my $host;
+GetOptions ( "--host=s" => \$host,
+    "--dbname=s" => \$dbname,
+    "--username=s" => \$username,
+    "--password=s" => \$password);
+my $dbh = DBI->connect("dbi:Pg:dbname=$dbname; host=$host", "$username", "$password",
+    {PrintError => 0});
+ok($dbh->err == 0) or (print $DBI::errstr and BAIL_OUT);
+
+my $query = "DELETE FROM test_results;";
+$dbh->do($query);
+ok($dbh->err == 0) or (print $DBI::errstr . "\n" and $dbh->disconnect() and BAIL_OUT);
+
+$query = "SELECT schedule.submit_job(\'SELECT * FROM test1\');";
+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 30;
+$query = "SELECT error FROM schedule.all_job_status WHERE id=$job_id";
+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();
+ok($errorstr eq "relation \"test1\" does not exist") or print $DBI::errstr . "\n";
+
+$dbh->disconnect();
+
+done_testing();
+
