ctdb-tests: Add marshalling tests for new control

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/tests/UNIT/cunit/protocol_test_101.sh b/ctdb/tests/UNIT/cunit/protocol_test_101.sh
index 36751d4fbe7c76aa4d505252ef123add82911444..a0bf9d08754ed09499cf1414b9a29d827ca88328 100755 (executable)
--- a/ctdb/tests/UNIT/cunit/protocol_test_101.sh
+++ b/ctdb/tests/UNIT/cunit/protocol_test_101.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-last_control=153
+last_control=154
 
 generate_control_output ()
 {

diff --git a/ctdb/tests/src/protocol_common_ctdb.c b/ctdb/tests/src/protocol_common_ctdb.c
index 4aa4cfc5bdec3d00dc40bc3f39c561617509040d..b02976b5d67f27f947d28a7035a4a6f0fc2bf627 100644 (file)
--- a/ctdb/tests/src/protocol_common_ctdb.c
+++ b/ctdb/tests/src/protocol_common_ctdb.c
@@ -588,6 +588,12 @@ void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
 
        case CTDB_CONTROL_TUNNEL_DEREGISTER:
                break;
+
+       case CTDB_CONTROL_VACUUM_FETCH:
+               cd->data.recbuf = talloc(mem_ctx, struct ctdb_rec_buffer);
+               assert(cd->data.recbuf != NULL);
+               fill_ctdb_rec_buffer(mem_ctx, cd->data.recbuf);
+               break;
        }
 }
 
@@ -974,6 +980,10 @@ void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
 
        case CTDB_CONTROL_TUNNEL_DEREGISTER:
                break;
+
+       case CTDB_CONTROL_VACUUM_FETCH:
+               verify_ctdb_rec_buffer(cd->data.recbuf, cd2->data.recbuf);
+               break;
        }
 }
 
@@ -1368,6 +1378,9 @@ void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_TUNNEL_DEREGISTER:
                break;
 
+       case CTDB_CONTROL_VACUUM_FETCH:
+               break;
+
        }
 }
 
@@ -1703,6 +1716,8 @@ void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_TUNNEL_DEREGISTER:
                break;
 
+       case CTDB_CONTROL_VACUUM_FETCH:
+               break;
        }
 }
 

diff --git a/ctdb/tests/src/protocol_ctdb_test.c b/ctdb/tests/src/protocol_ctdb_test.c
index 9eb25d96186b05c737b548835747d15c2940b8f9..3ebf15dff6cbabaa08af789e47f703163e519ce4 100644 (file)
--- a/ctdb/tests/src/protocol_ctdb_test.c
+++ b/ctdb/tests/src/protocol_ctdb_test.c
@@ -284,7 +284,7 @@ PROTOCOL_CTDB4_TEST(struct ctdb_req_dmaster, ctdb_req_dmaster,
 PROTOCOL_CTDB4_TEST(struct ctdb_reply_dmaster, ctdb_reply_dmaster,
                        CTDB_REPLY_DMASTER);
 
-#define NUM_CONTROLS   154
+#define NUM_CONTROLS   155
 
 PROTOCOL_CTDB2_TEST(struct ctdb_req_control_data, ctdb_req_control_data);
 PROTOCOL_CTDB2_TEST(struct ctdb_reply_control_data, ctdb_reply_control_data);