Fixed internal test suite.

server/core/adminusers.c

@@ -29,7 +29,7 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 #include <gwdirs.h>
-
+#include <sys/stat.h>
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;
 extern size_t         log_ses_count[];
@@ -154,6 +154,11 @@ FILE	*fp;
 char	fname[1024], *home, *cpasswd;
 
 	initialise();
+
+    if(access(get_datadir(), F_OK) != 0)
+        if(mkdir(get_datadir(), S_IRWXU) != 0 && errno != EEXIST)
+           return ADMIN_ERR_PWDFILEOPEN;
+
     snprintf(fname,1023, "%s/passwd", get_datadir());
     fname[1023] = '\0';
 	if (users == NULL)

server/core/config.c

@@ -2334,6 +2334,7 @@ static char *InternalRouters[] = {
     "cli",
     "maxinfo",
     "binlogrouter",
+    "testroute",
     NULL
 };
 

server/core/test/testadminusers.c

@@ -270,7 +270,7 @@ char	*home, buf[1024];
 
 	/* Unlink any existing password file before running this test */
 	
-	sprintf(buf, "%s/passwd", default_cachedir);
+	sprintf(buf, "%s/passwd", get_datadir());
     if(!is_valid_posix_path(buf))
         exit(1);
 	if (strcmp(buf, "/etc/passwd") != 0)

server/core/test/testdcb.c

@@ -59,7 +59,7 @@ int     buflen;
         printAllDCBs();
         ss_info_dassert(true, "Something is true");
         ss_dfprintf(stderr, "\t..done\n");
-        dcb_free(dcb);
+        dcb_close(dcb);
         ss_dfprintf(stderr, "Freed original dcb");
         ss_info_dassert(!dcb_isvalid(dcb), "Freed DCB must not be valid");
         ss_dfprintf(stderr, "\t..done\nMake clone DCB a zombie");

server/core/test/testfeedback.c

@@ -41,6 +41,7 @@
 #include <buffer.h>
 #include <regex.h>
 #include <modules.h>
+#include <maxscale_test.h>
 
 static char* server_options[] = {
     "MariaDB Corporation MaxScale",
@@ -65,6 +66,7 @@ static char* server_groups[] = {
 };
 
 int config_load(char *);
+void config_enable_feedback_task(void);
 int module_create_feedback_report(GWBUF **buffer, MODULES *modules, FEEDBACK_CONF *cfg);
 int do_http_post(GWBUF *buffer, void *cfg);
 
@@ -78,7 +80,8 @@ int main(int argc, char** argv)
 
     hkinit();
 
-    cnf = strdup("/etc/MaxScale.cnf");
+    cnf = malloc(sizeof(char) * (strlen(TEST_DIR) + strlen("/maxscale.cnf") + 1));
+    sprintf(cnf, "%s/maxscale.cnf", TEST_DIR);
 
     printf("Config: %s\n",cnf);
 
@@ -89,7 +92,7 @@ int main(int argc, char** argv)
        }
 
     config_load(cnf);
-
+    config_enable_feedback_task();
     if ((fc = config_get_feedback_data()) == NULL)
     {
         FAILTEST("Configuration for Feedback was NULL.");

server/core/test/testmodutil.c

@@ -70,10 +70,11 @@ int
 test2()
 {
 GWBUF   *buffer;
-char len = 128;
+unsigned int len = 128;
 char query[129];
 
-        buffer = gwbuf_alloc(132);
+	/** Allocate space for the COM_QUERY header and payload */
+    buffer = gwbuf_alloc(5 + 128);
 	ss_info_dassert((buffer != NULL),"Buffer should not be null");
 
 	memset(query,';',128);

server/core/test/testpoll.c

@@ -86,7 +86,7 @@ int     result;
         sleep(10);
         poll_shutdown();
         ss_dfprintf(stderr, "\t..done\nTidy up.");
-        dcb_free(dcb);
+        dcb_close(dcb);
         ss_dfprintf(stderr, "\t..done\n");
 		
 	return 0;

server/core/test/testservice.c

@@ -41,15 +41,6 @@
 #include <test_utils.h>
 #include <service.h>
 
-
-static bool success = false;
-
-int hup(DCB* dcb)
-{
-    success = true;
-    return 1;
-}
-
 /**
  * test1	Allocate a service and do lots of other things
  *
@@ -64,17 +55,6 @@ int	    result;
 int	    argc = 3;
 
 init_test_env(NULL);
-/* char*	    argv[] = */
-/* { */
-/*     "log_manager", */
-/*     "-j", */
-/*     TEST_LOG_DIR, */
-/*     NULL */
-/* }; */
-
-/* skygw_logmanager_init(argc,argv); */
-/* poll_init(); */
-/* hkinit(); */
 
         /* Service tests */
         ss_dfprintf(stderr,
@@ -98,9 +78,9 @@ init_test_env(NULL);
         result = serviceStart(service);
         skygw_log_sync_all();
         ss_info_dassert(0 != result, "Start should succeed");
-        result = serviceStop(service);
+        serviceStop(service);
         skygw_log_sync_all();
-        ss_info_dassert(0 != result, "Stop should succeed");
+        ss_info_dassert(service->state == SERVICE_STATE_STOPPED, "Stop should succeed");
         result = serviceStartAll();
         skygw_log_sync_all();
         ss_info_dassert(0 != result, "Start all should succeed");
@@ -111,9 +91,9 @@ init_test_env(NULL);
         result = serviceStart(service);
         skygw_log_sync_all();
         ss_info_dassert(0 != result, "Start should succeed");
-        result = serviceStop(service);
+        serviceStop(service);
         skygw_log_sync_all();
-        ss_info_dassert(0 != result, "Stop should succeed");
+        ss_info_dassert(service->state == SERVICE_STATE_STOPPED, "Stop should succeed");
 
         if((dcb = dcb_alloc(DCB_ROLE_REQUEST_HANDLER)) == NULL)
             return 1;
@@ -121,25 +101,16 @@ init_test_env(NULL);
         
         session = session_alloc(service,dcb);
         ss_info_dassert(session != NULL, "Session allocation failed");
-        session->client->state = DCB_STATE_POLLING;
-        session->client->func.hangup = hup;
+        dcb->state = DCB_STATE_POLLING;
         sleep(15);
         
-        ss_info_dassert(success, "Session timeout failed");
+        ss_info_dassert(dcb->state != DCB_STATE_POLLING, "Session timeout failed");
 
         ss_dfprintf(stderr, "\t..done\nStopping Service.");
-        ss_info_dassert(0 != serviceStop(service), "Stop should succeed");
+        serviceStop(service);
+        ss_info_dassert(service->state == SERVICE_STATE_STOPPED, "Stop should succeed");
         ss_dfprintf(stderr, "\t..done\n");
 
-	/** This is never used in MaxScale and will always fail due to service's
-	 * stats.n_current value never being decremented */
-/* 
-	
-        ss_dfprintf(stderr, "\t..done\nFreeing Service.");
-        ss_info_dassert(0 != service_free(service), "Free should succeed");
-        ss_dfprintf(stderr, "\t..done\n");
-		
-*/
 	return 0;
         
 }

server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh

@@ -26,7 +26,7 @@ else
     TDIR=.
 fi
 
-RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\ --comment
+RUNCMD="mysql --host=$THOST -P$TPORT -u$TUSER -p$TPWD --unbuffered=true --disable-reconnect --silent -c"
 i=0
 
 while read -r LINE