Changeset 989 for vendor/current/ctdb/tests/src

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/ctdb/tests/src

Files:

• ctdbd_test.c (modified) (1 diff)
• pidfile_test.c (added)
• protocol_client_test.c (modified) (4 diffs)
• protocol_types_test.c (modified) (6 diffs)

vendor/current/ctdb/tests/src/ctdbd_test.c

@@ -48 +48 @@
 #include "common/reqid.c"
 #include "common/logging.c"
+#include "common/pidfile.c"
 
 /* CTDB_SERVER_OBJ */

vendor/current/ctdb/tests/src/protocol_client_test.c

@@ -657 +657 @@
                 cd->data.db_id = rand32();
                 break;
+
+        case CTDB_CONTROL_DB_PULL:
+                cd->data.pulldb_ext = talloc(mem_ctx, struct ctdb_pulldb_ext);
+                assert(cd->data.pulldb_ext != NULL);
+                fill_ctdb_pulldb_ext(mem_ctx, cd->data.pulldb_ext);
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_START:
+                cd->data.pulldb_ext = talloc(mem_ctx, struct ctdb_pulldb_ext);
+                assert(cd->data.pulldb_ext != NULL);
+                fill_ctdb_pulldb_ext(mem_ctx, cd->data.pulldb_ext);
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_CONFIRM:
+                cd->data.db_id = rand32();
+                break;
+
         }
 }
@@ -1104 +1121 @@
                 assert(cd->data.db_id == cd2->data.db_id);
                 break;
+
+        case CTDB_CONTROL_DB_PULL:
+                verify_ctdb_pulldb_ext(cd->data.pulldb_ext,
+                                       cd2->data.pulldb_ext);
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_START:
+                verify_ctdb_pulldb_ext(cd->data.pulldb_ext,
+                                       cd2->data.pulldb_ext);
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_CONFIRM:
+                assert(cd->data.db_id == cd2->data.db_id);
+                break;
+
         }
 }
@@ -1560 +1592 @@
                 break;
 
+        case CTDB_CONTROL_DB_PULL:
+                cd->data.num_records = rand32();
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_CONFIRM:
+                cd->data.num_records = rand32();
+                break;
+
         }
 }
@@ -1941 +1981 @@
         case CTDB_CONTROL_GET_NODES_FILE:
                 verify_ctdb_node_map(cd->data.nodemap, cd2->data.nodemap);
+                break;
+
+        case CTDB_CONTROL_DB_PULL:
+                assert(cd->data.num_records == cd2->data.num_records);
+                break;
+
+        case CTDB_CONTROL_DB_PUSH_CONFIRM:
+                assert(cd->data.num_records == cd2->data.num_records);
                 break;
 

vendor/current/ctdb/tests/src/protocol_types_test.c

@@ -20 +20 @@
 #include "replace.h"
 #include "system/network.h"
+#include "system/filesys.h"
 
 #include <assert.h>
@@ -181 +182 @@
         assert(p1->db_id == p2->db_id);
         assert(p1->lmaster == p2->lmaster);
+}
+
+static void fill_ctdb_pulldb_ext(TALLOC_CTX *mem_ctx,
+                                 struct ctdb_pulldb_ext *p)
+{
+        p->db_id = rand32();
+        p->lmaster = rand32();
+        p->srvid = rand64();
+}
+
+static void verify_ctdb_pulldb_ext(struct ctdb_pulldb_ext *p1,
+                                   struct ctdb_pulldb_ext *p2)
+{
+        assert(p1->db_id == p2->db_id);
+        assert(p1->lmaster == p2->lmaster);
+        assert(p1->srvid == p2->srvid);
 }
 
@@ -1178 +1195 @@
 DEFINE_TEST(struct ctdb_dbid_map, ctdb_dbid_map);
 DEFINE_TEST(struct ctdb_pulldb, ctdb_pulldb);
+DEFINE_TEST(struct ctdb_pulldb_ext, ctdb_pulldb_ext);
 DEFINE_TEST(struct ctdb_rec_data, ctdb_rec_data);
 DEFINE_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer);
@@ -1219 +1237 @@
 DEFINE_TEST(struct ctdb_g_lock_list, ctdb_g_lock_list);
 
+static void test_ctdb_rec_buffer_read_write(void)
+{
+        TALLOC_CTX *mem_ctx = talloc_new(NULL);
+        struct ctdb_rec_buffer *p1, **p2;
+        const char *filename = "ctdb_rec_buffer_test.dat";
+        int count = 100;
+        int fd, i, ret;
+        off_t offset;
+
+        p1 = talloc_array(mem_ctx, struct ctdb_rec_buffer, count);
+        assert(p1 != NULL);
+        for (i=0; i<count; i++) {
+                fill_ctdb_rec_buffer(mem_ctx, &p1[i]);
+        }
+
+        fd = open(filename, O_RDWR|O_CREAT, 0600);
+        assert(fd != -1);
+        unlink(filename);
+
+        for (i=0; i<count; i++) {
+                ret = ctdb_rec_buffer_write(&p1[i], fd);
+                assert(ret == 0);
+        }
+
+        offset = lseek(fd, 0, SEEK_CUR);
+        assert(offset != -1);
+        offset = lseek(fd, -offset, SEEK_CUR);
+        assert(offset == 0);
+
+        p2 = talloc_array(mem_ctx, struct ctdb_rec_buffer *, count);
+        assert(p2 != NULL);
+
+        for (i=0; i<count; i++) {
+                ret = ctdb_rec_buffer_read(fd, mem_ctx, &p2[i]);
+                assert(ret == 0);
+        }
+
+        close(fd);
+
+        for (i=0; i<count; i++) {
+                verify_ctdb_rec_buffer(&p1[i], p2[i]);
+        }
+
+        talloc_free(mem_ctx);
+}
+
 int main(int argc, char *argv[])
 {
@@ -1241 +1305 @@
         TEST_FUNC(ctdb_dbid_map)();
         TEST_FUNC(ctdb_pulldb)();
+        TEST_FUNC(ctdb_pulldb_ext)();
         TEST_FUNC(ctdb_rec_data)();
         TEST_FUNC(ctdb_rec_buffer)();
@@ -1282 +1347 @@
         TEST_FUNC(ctdb_g_lock_list)();
 
+        test_ctdb_rec_buffer_read_write();
+
         return 0;
 }