MXS-2900 maxtest includes cleanup, part 3

maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp

@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::stringstream;

maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <maxbase/format.hh>
 

maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp

@@ -1,7 +1,7 @@
 /**
  * Test monitoring and failover with ignore_external_masters=true
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <atomic>
 #include <thread>

maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 #include <string>
 

maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 
 int main(int argc, char** argv)

maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <exception>
 #include <iostream>
 #include <sstream>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp

@@ -13,7 +13,7 @@
 
 // MXS-2652: https://jira.mariadb.org/browse/MXS-2652
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 using std::string;
 

maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp

@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;

maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp

@@ -21,9 +21,9 @@
 #include <iostream>
 #include <string>
 #include <set>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
 #include <jansson.h>
 #include <maxbase/string.hh>
 

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp

@@ -15,7 +15,7 @@
 #include <iostream>
 #include <iterator>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 

maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp

@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;

maxscale-system-test/mariadbmonitor/verify_master_failure.cpp

@@ -4,7 +4,7 @@
  * Testing of master failure verification
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {