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

Commit 5f35060

Browse files
committed
fix TAP tests after merge with -master
1 parent 2355da8 commit 5f35060

File tree

6 files changed

+26
-5
lines changed

6 files changed

+26
-5
lines changed

Cluster.pm

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,18 @@ sub stop
132132

133133
foreach my $node (@$nodes)
134134
{
135-
$node->stop();
135+
$node->stop('fast');
136+
}
137+
}
138+
139+
sub teardown
140+
{
141+
my ($self) = @_;
142+
my $nodes = $self->{nodes};
143+
144+
foreach my $node (@$nodes)
145+
{
146+
$node->teardown();
136147
}
137148
}
138149

t/000_deadlock.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,6 @@ sub query_exec_async
9292
}
9393

9494
query_row($conns[0], "select * from t where k = 1");
95+
96+
$cluster->stop();
97+
1;

t/001_basic_recovery.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@
8080

8181
is($psql_out, '40', "Check replication after failed node recovery.");
8282

83-
83+
$cluster->stop();
84+
1;

t/002_cross.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,6 @@ sub parse_state
149149
}
150150

151151
is($anomalies, 0, "no cross anomalies after $selects selects");
152+
153+
$cluster->stop();
154+
1;

t/003_pgbench.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,6 @@ sub writer
109109

110110
($rc, $out, $err) = $cluster->psql(0, 'postgres', "select count(*) from reader_log where v = 0;");
111111
isnt($out, 0, "there are some zeros in reader_log");
112+
113+
$cluster->stop();
114+
1;

tests/writer.pgb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
\setrandom src 0 999
2-
\setrandom dst 0 999
3-
\setrandom amount 1 10
1+
\set src random(0, 999)
2+
\set dst random(0, 999)
3+
\set amount random(1, 10)
44
begin;
55
update t set v = v - :amount where k=:src;
66
update t set v = v + :amount where k=:dst;

0 commit comments

Comments
 (0)