summaryrefslogtreecommitdiff
path: root/ctdb/tests
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2017-03-02 17:07:13 +1100
committerMartin Schwenke <martins@samba.org>2017-06-29 10:34:27 +0200
commitb783b930de52554457647258bd4d843db912a38b (patch)
tree6a42ca7cbd224b11db285b43892e9be860864fd6 /ctdb/tests
parentb8a0420d10021c5521335f81effaeb28f43fd307 (diff)
downloadsamba-b783b930de52554457647258bd4d843db912a38b.tar.gz
ctdb-protocol: Add marshalling for CTDB_CONTROL_DB_ATTACH_REPLICATED control
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/tests')
-rwxr-xr-xctdb/tests/cunit/protocol_test_002.sh2
-rw-r--r--ctdb/tests/src/protocol_client_test.c18
2 files changed, 18 insertions, 2 deletions
diff --git a/ctdb/tests/cunit/protocol_test_002.sh b/ctdb/tests/cunit/protocol_test_002.sh
index 0a3890eb24d..ac0eeefa9df 100755
--- a/ctdb/tests/cunit/protocol_test_002.sh
+++ b/ctdb/tests/cunit/protocol_test_002.sh
@@ -2,7 +2,7 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-last_control=149
+last_control=150
control_output=$(
for i in $(seq 0 $last_control) ; do
diff --git a/ctdb/tests/src/protocol_client_test.c b/ctdb/tests/src/protocol_client_test.c
index fab61b7964d..e34879fd601 100644
--- a/ctdb/tests/src/protocol_client_test.c
+++ b/ctdb/tests/src/protocol_client_test.c
@@ -596,6 +596,10 @@ static void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
cd->data.db_id = rand32();
break;
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ fill_ctdb_string(mem_ctx, &cd->data.db_name);
+ assert(cd->data.db_name != NULL);
+ break;
}
}
@@ -996,6 +1000,10 @@ static void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
assert(cd->data.db_id == cd2->data.db_id);
break;
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ verify_ctdb_string(cd->data.db_name, cd2->data.db_name);
+ break;
+
}
}
@@ -1408,6 +1416,10 @@ static void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
cd->data.tdb_flags = rand32();
break;
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ cd->data.db_id = rand32();
+ break;
+
}
}
@@ -1750,6 +1762,10 @@ static void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
assert(cd->data.tdb_flags == cd2->data.tdb_flags);
break;
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ assert(cd->data.db_id == cd2->data.db_id);
+ break;
+
}
}
@@ -2192,7 +2208,7 @@ static void test_ctdb_reply_dmaster(void)
talloc_free(mem_ctx);
}
-#define NUM_CONTROLS 150
+#define NUM_CONTROLS 151
static void test_ctdb_req_control_data(void)
{