Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7467c08

Browse files
knizhnikkelvich
authored andcommitted
Slightly rewrite travis test
1 parent 2356038 commit 7467c08

File tree

1 file changed

+29
-16
lines changed

1 file changed

+29
-16
lines changed

t/001_basic_recovery.pl

+29-16
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,26 @@
4343

4444
sleep(5); # Wait until failure of node will be detected
4545

46-
my $ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);");
46+
diag("inserting 2 on node 1");
47+
my $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);"); # this transaciton may fail
4748
diag "tx1 status = $ret";
4849

49-
diag("inserting 2");
50-
my $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);");
50+
diag("inserting 3 on node 2");
51+
my $ret = $cluster->psql(1, 'postgres', "insert into t values(3, 30);"); # this transaciton may fail
52+
diag "tx2 status = $ret";
53+
54+
diag("inserting 4 on node 1 (can fail)");
55+
my $ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);");
56+
diag "tx1 status = $ret";
57+
58+
diag("inserting 5 on node 2 (can fail)");
59+
my $ret = $cluster->psql(1, 'postgres', "insert into t values(5, 50);");
5160
diag "tx2 status = $ret";
5261

5362
diag("selecting");
54-
$cluster->psql(1, 'postgres', "select v from t where k=2;", stdout => \$psql_out);
63+
$cluster->psql(1, 'postgres', "select v from t where k=4;", stdout => \$psql_out);
5564
diag("selected");
56-
is($psql_out, '20', "Check replication after node failure.");
65+
is($psql_out, '40', "Check replication after node failure.");
5766

5867
###############################################################################
5968
# Work after node start
@@ -62,25 +71,29 @@
6271
diag("starting node 2");
6372
$cluster->{nodes}->[2]->start;
6473

65-
sleep(10); # Wait until recovery of node will be completed
66-
6774
$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
75+
sleep(5); # Wait until recovery of node will be completed
6876

69-
diag("inserting 3");
70-
$cluster->psql(0, 'postgres', "insert into t values(3, 30);");
71-
diag("inserting 4");
72-
$cluster->psql(1, 'postgres', "insert into t values(4, 40);");
77+
diag("inserting 6 on node 1 (can fail)");
78+
$cluster->psql(0, 'postgres', "insert into t values(6, 60);");
79+
diag("inserting 7 on node 2 (can fail)");
80+
$cluster->psql(1, 'postgres', "insert into t values(7, 70);");
7381

74-
diag("selecting");
75-
$cluster->psql(2, 'postgres', "select v from t where k=3;", stdout => \$psql_out);
82+
diag("inserting 8 on node 1");
83+
$cluster->psql(0, 'postgres', "insert into t values(8, 80);");
84+
diag("inserting 9 on node 2");
85+
$cluster->psql(1, 'postgres', "insert into t values(9, 90);");
86+
87+
diag("selecting from node 3");
88+
$cluster->psql(2, 'postgres', "select v from t where k=8;", stdout => \$psql_out);
7689
diag("selected");
7790

78-
is($psql_out, '30', "Check replication after failed node recovery.");
91+
is($psql_out, '80', "Check replication after failed node recovery.");
7992

80-
$cluster->psql(2, 'postgres', "select v from t where k=4;", stdout => \$psql_out);
93+
$cluster->psql(2, 'postgres', "select v from t where k=9;", stdout => \$psql_out);
8194
diag("selected");
8295

83-
is($psql_out, '40', "Check replication after failed node recovery.");
96+
is($psql_out, '90', "Check replication after failed node recovery.");
8497

8598
$cluster->stop();
8699
1;

0 commit comments

Comments
 (0)