From 9e6872621901bb98cb3a1293bb2379b5afa56327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus456@gmail.com>
Date: Mon, 8 May 2017 14:41:29 +0300
Subject: [PATCH] Fix internal test suite

Fixed minor problems in DCB and configuration tests.
---
 server/core/test/testconfig.cc |  2 +-
 server/core/test/testdcb.cc    | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/server/core/test/testconfig.cc b/server/core/test/testconfig.cc
index 69370c4fc..564c9356b 100644
--- a/server/core/test/testconfig.cc
+++ b/server/core/test/testconfig.cc
@@ -137,7 +137,7 @@ int test_add_parameter()
     };
 
 
-    CONFIG_CONTEXT svc1, svc2, ctx;
+    CONFIG_CONTEXT svc1 = {}, svc2 = {}, ctx = {};
     svc1.object = (char*)"my-service";
     svc2.object = (char*)"some-service";
     svc2.next = &svc1;
diff --git a/server/core/test/testdcb.cc b/server/core/test/testdcb.cc
index 7edecc46b..d6ece4e9c 100644
--- a/server/core/test/testdcb.cc
+++ b/server/core/test/testdcb.cc
@@ -45,12 +45,7 @@
 static int
 test1()
 {
-    DCB   *dcb, *extra, *clone;
-    int     size = 100;
-    int     bite1 = 35;
-    int     bite2 = 60;
-    int     bite3 = 10;
-    int     buflen;
+    DCB   *dcb;
     SERV_LISTENER dummy;
     /* Single buffer tests */
     ss_dfprintf(stderr,
@@ -59,8 +54,6 @@ test1()
     printDCB(dcb);
     ss_info_dassert(dcb_isvalid(dcb), "New DCB must be valid");
     ss_dfprintf(stderr, "\t..done\nAllocated dcb.");
-    clone = dcb_clone(dcb);
-    ss_dfprintf(stderr, "\t..done\nCloned dcb");
     printAllDCBs();
     ss_info_dassert(true, "Something is true");
     ss_dfprintf(stderr, "\t..done\n");
@@ -68,12 +61,6 @@ test1()
     dcb_close(dcb);
     ss_dfprintf(stderr, "Freed original dcb");
     ss_info_dassert(!dcb_isvalid(dcb), "Closed DCB must not be valid");
-    ss_dfprintf(stderr, "\t..done\nMake clone DCB a zombie");
-    clone->state = DCB_STATE_NOPOLLING;
-    dcb_add_to_list(clone);
-    dcb_close(clone);
-    ss_dfprintf(stderr, "\t..done\nCheck clone no longer valid");
-    ss_info_dassert(!dcb_isvalid(clone), "After closing, clone DCB must not be valid");
     ss_dfprintf(stderr, "\t..done\nProcess the zombies list");
     dcb_process_zombies(0);
     ss_dfprintf(stderr, "\t..done\n");