summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-11-25 13:07:05 +0000
committerMarko Kreen2010-11-25 13:07:05 +0000
commit8ebaf0a400352e63f4b034753f88a488dce60150 (patch)
tree1e1cd20c0f104c790832967cb29230a0c1b93cce
parent62dbb0818ac56d602ff0d4225a992122dbfa8490 (diff)
tests/merge: some improvements
-rwxr-xr-xtests/merge/init.sh2
-rwxr-xr-xtests/merge/regen.sh7
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/merge/init.sh b/tests/merge/init.sh
index 3f992dc9..b713ce36 100755
--- a/tests/merge/init.sh
+++ b/tests/merge/init.sh
@@ -4,6 +4,8 @@
lst="part1 part2 part3 part4 full1 full2 full3 full4"
+../zstop.sh
+
for db in $lst; do
echo dropdb $db
dropdb $db
diff --git a/tests/merge/regen.sh b/tests/merge/regen.sh
index 28785bdf..5b1c5088 100755
--- a/tests/merge/regen.sh
+++ b/tests/merge/regen.sh
@@ -13,6 +13,7 @@ for dst in $full_list; do
done
done
all_list="$part_list $full_list"
+kdb_list="`echo $all_list|sed 's/ /,/g'`"
for db in $part_list $full_list; do
cleardb $db
@@ -144,6 +145,12 @@ for db in full1; do
done
done
+msg "Create table and register it in full nodes"
+for db in full2 full3 full4; do
+ run_sql $db "create table mydata (id int4 primary key, data text)"
+ run londiste3 $v conf/londiste_$db.ini add-table mydata
+done
+
msg "Sleep a bit"
run sleep 10