Changing the test to ensure a) wait for a sync before finishing

b) have an 'id' field for result comparision because the common
compare code expects it.

diff --git a/clustertest/regression/testpkeychange/testpkeychange.js b/clustertest/regression/testpkeychange/testpkeychange.js
index e18ba43d374353c4430af6b4bc83ee93efc0b0b7..273b5876c6a83ea55cd2dbc4c736a3479a2db546 100644 (file)
--- a/clustertest/regression/testpkeychange/testpkeychange.js
+++ b/clustertest/regression/testpkeychange/testpkeychange.js
@@ -68,11 +68,12 @@ function do_test(coordinator) {
        psql = coordinator.createPsqlCommand('db1',sql);
        psql.run();
        coordinator.join(psql);
-       
+       wait_for_sync(coordinator);
+
 }
 
 function get_compare_queries() {
-       var queries=['SELECT id1,id2,id3,data FROM test1 order by id1,id2,id3'
+       var queries=['SELECT id1::text||id2::text as id, id1,id2,id3,data FROM test1 order by id1,id2,id3'
                     ];
        return queries;
 }