tests/merge: some improvements

diff --git a/tests/merge/init.sh b/tests/merge/init.sh
index 3f992dc98d0b38121db9c125040e2b0ac1885f93..b713ce36fe392d156cc16173f8bcbbaddaebedef 100755 (executable)
--- 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 28785bdf88a6e9b9fcacc1c1763568c42bcebe44..5b1c50881764051527582869d3eda176f8f4b57f 100755 (executable)
--- 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