|
3 | 3 |
|
4 | 4 | use PostgresNode; |
5 | 5 | use TestLib; |
6 | | -use Test::Moretests=>5; |
| 6 | +use Test::Moretests=>10; |
7 | 7 |
|
8 | 8 | subgenstr |
9 | 9 | { |
@@ -80,19 +80,21 @@ sub start_nodes |
80 | 80 | sleep(5); |
81 | 81 | while (my ($key,$value) =each(%tests)) |
82 | 82 | { |
83 | | -my$o =$baker->psql('postgres',"select raftable('$key');"); |
84 | | -is($o,$value,"Baker has '$key'"); |
| 83 | +my ($rc,$stdout,$stderr) =$baker->psql('postgres',"select raftable('$key');"); |
| 84 | +is($rc, 0,"Baker returns '$key'"); |
| 85 | +is($stdout,$value,"Baker has the proper value for '$key'"); |
85 | 86 | } |
86 | 87 |
|
87 | 88 | my$ok = 1; |
88 | | -my$o =$baker->psql('postgres',"select raftable();"); |
89 | | -while ($o =~/\((\w+),(\w+)\)/g) |
| 89 | +my ($rc,$stdout,$stderr) =$baker->psql('postgres',"select raftable();"); |
| 90 | +is($rc, 0,"Baker returns everything"); |
| 91 | +while ($stdout =~/\((\w+),(\w+)\)/g) |
90 | 92 | { |
91 | 93 | if (!exists$tests{$1}) {$ok = 0;last; } |
92 | 94 | my$val =delete$tests{$1}; |
93 | 95 | if ($valne$2) {$ok = 0;last; } |
94 | 96 | } |
95 | 97 | if (keys%tests > 0) {$ok = 0; } |
96 | | -is($ok, 1,"Baker has everything"); |
| 98 | +is($ok, 1,"Baker hasthe proper value foreverything"); |
97 | 99 |
|
98 | 100 | exit(0); |