doc and astyle fixes

maxscale-system-test/keepalived_masterdown.cpp

@@ -63,7 +63,8 @@ int main(int argc, char *argv[])
 
     print_version_string(Test);
 
-    sleep(FAILOVER_WAIT_TIME);sleep(FAILOVER_WAIT_TIME);
+    sleep(FAILOVER_WAIT_TIME);
+    sleep(FAILOVER_WAIT_TIME);
 
     // initial state: 000 expected to be active, 001 - passive
     passive = check_maxscale_passive(Test, 0);

maxscale-system-test/mariadb_func.cpp

@@ -542,7 +542,8 @@ Result get_result(MYSQL* conn, std::string sql)
 Row get_row(MYSQL* conn, std::string sql)
 {
     Result res = get_result(conn, sql);
-    return res.empty() ? Row{} : res[0];
+    return res.empty() ? Row{} :
+           res[0];
 }
 
 int get_int_version(std::string version)

maxscale-system-test/mdbci/README.md

@@ -22,7 +22,7 @@ Test setup is described in template. Templates are stored in
 Own template have to be put to the same directory.
 
 Default environment for tests consists of:
-* one VM for Maxscale
+* 2 VMs for Maxscales
 * 4 VMs for master/slave setup
 * 4 VMs for Galera cluster
 
@@ -35,6 +35,7 @@ Template name|Description
 ---|---
  ```nogalera``` |only 1 VM for Maxscale and 4 for Master/Slaves|
  ```twomaxscales``` |2 VMs for Maxscale and 4 for Master/Slaves|
+ ```onemaxscale``` |1 VM for Maxscale, 4 for Master/Slaves and 4 for Galera|
  ```big``` |1 VM for Maxscale, 8 for Master/Slaves and 4 for Galera|
  ```big15``` |1 VM for Maxscale, 15 for Master/Slaves and 4 for Galera|
 

maxscale-system-test/mdbci/set_run_test_variables.sh

@@ -8,7 +8,7 @@ echo "MDBCI_VM_PATH=$MDBCI_VM_PATH"
 export box=${box:-"centos_7_libvirt"}
 echo "box=$box"
 
-export template=${template:-"twomaxscales_full"}
+export template=${template:-"default"}
 
 export curr_date=`date '+%Y-%m-%d_%H-%M'`
 

maxscale-system-test/mdbci/templates/default.json.template

@@ -104,7 +104,19 @@
         }
   },
 
-  "maxscale" :
+  "maxscale_000" :
+  {
+        "hostname" : "maxscale",
+        "box" : "${box}",
+        "memory_size" : "${vm_memory}",
+        "product" : {
+                 "name" : "maxscale_ci",
+                "version" : "${target}"
+        }
+
+  },
+
+  "maxscale_001" :
   {
         "hostname" : "maxscale",
         "box" : "${box}",

maxscale-system-test/mdbci/templates/onemaxscale.json.template

@@ -104,19 +104,7 @@
         }
   },
 
-  "maxscale_000" :
-  {
-        "hostname" : "maxscale",
-        "box" : "${box}",
-        "memory_size" : "${vm_memory}",
-        "product" : {
-                 "name" : "maxscale_ci",
-                "version" : "${target}"
-        }
-
-  },
-
-  "maxscale_001" :
+  "maxscale" :
   {
         "hostname" : "maxscale",
         "box" : "${box}",

maxscale-system-test/mxs1628_bad_handshake.cpp

@@ -19,9 +19,11 @@ int main(int argc, char *argv[])
     std::vector<uint8_t> wbuf;
     auto it = std::back_inserter(wbuf);
 
-    for (auto a: {(uint8_t)(caps), (uint8_t)(caps >> 8), (uint8_t)(caps >> 16), (uint8_t)(caps >> 24),
+    for (auto a: {
+                (uint8_t)(caps), (uint8_t)(caps >> 8), (uint8_t)(caps >> 16), (uint8_t)(caps >> 24),
                 (uint8_t)(max_packet), (uint8_t)(max_packet >> 8), (uint8_t)(max_packet >> 16), (uint8_t)(max_packet >> 24),
-                charset})
+                charset
+            })
     {
         *it++ = a;
     }

maxscale-system-test/mxs1713_lots_of_databases.cpp

@@ -45,7 +45,9 @@ int main(int argc, char** argv)
 
     test.assert(errors.empty(), "None of the queries should fail: %s",
                 std::accumulate(errors.begin(), errors.end(), std::string(),
-                                [](const std::string &a, const std::string &b){return a + b + " ";}));
+    [](const std::string &a, const std::string &b) {
+        return a + b + " ";
+    }));
 
     test.tprintf("Dropping databases...");
     for (auto db : db_list)

maxscale-system-test/mxs1961_standalone_rejoin.cpp

@@ -12,7 +12,9 @@ void checkpoint(TestConnections& test)
     const int v = 5;
     test.maxscales->wait_for_monitor(v);
 
-    for (auto&& s: {"server1", "server2", "server3"})
+    for (auto&& s: {
+                "server1", "server2", "server3"
+            })
     {
         auto status = test.get_server_status(s);
         cout << s << " { ";

maxscale-system-test/mxs872_roles.cpp

@@ -25,7 +25,8 @@ int main(int argc, char** argv)
                                   "CREATE USER 'test2'@'%' IDENTIFIED BY 'test2'",
                                   "GRANT dba TO 'test'@'%'",
                                   "GRANT dba TO 'test2'@'%'",
-                                  "SET DEFAULT ROLE dba FOR 'test'@'%'"}))
+                                  "SET DEFAULT ROLE dba FOR 'test'@'%'"
+                                 }))
     {
         test.try_query(test.repl->nodes[0], "%s", a.c_str());
     }
@@ -50,7 +51,8 @@ int main(int argc, char** argv)
     for (auto a : vector<string>({"DROP DATABASE IF EXISTS my_db",
                                   "DROP ROLE IF EXISTS dba",
                                   "DROP USER 'test'@'%'",
-                                  "DROP USER 'test2'@'%'"}))
+                                  "DROP USER 'test2'@'%'"
+                                 }))
     {
         execute_query_silent(test.repl->nodes[0], "%s", a.c_str());
     }