hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2146: Add conditional columnstore usage

Browse Source 
Tests can now declare that they require a columnstore setup. If one is not
present, the test is skipped.
This commit is contained in:
Markus Mäkelä
2018-11-19 10:37:47 +02:00
parent 92b4ed2867
commit da1772f8c9
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/testconnections.cpp
View File

@ -30,6 +30,7 @@ static std::string required_repl_version;
static std::string required_galera_version; static std::string required_galera_version;
static bool restart_galera = false; static bool restart_galera = false;
static bool require_galera = false; static bool require_galera = false;
static bool require_columnstore = false;
static bool multiple_maxscales = false; static bool multiple_maxscales = false;
} }
@ -91,6 +92,11 @@ void TestConnections::require_galera(bool value)
maxscale::require_galera = value; maxscale::require_galera = value;
} }
void TestConnections::require_columnstore(bool value)
{
maxscale::require_columnstore = value;
}
void TestConnections::restart_galera(bool value) void TestConnections::restart_galera(bool value)
{ {
maxscale::restart_galera = value; maxscale::restart_galera = value;
@ -259,7 +265,13 @@ TestConnections::TestConnections(int argc, char* argv[])
if (no_galera && maxscale::require_galera) if (no_galera && maxscale::require_galera)
{ {
cout << "Galera not in use, skipping test" <<endl; cout << "Galera not in use, skipping test" << endl;
exit(0);
}
if (maxscale::require_columnstore)
{
cout << "ColumnStore testing is not yet implemented, skipping test" << endl;
exit(0); exit(0);
} }

5
maxscale-system-test/testconnections.h
View File

@ -263,9 +263,12 @@ public:
static void require_repl_version(const char* version); static void require_repl_version(const char* version);
static void require_galera_version(const char* version); static void require_galera_version(const char* version);
/** Require that a backend is present*/ /** Require that galera is present*/
static void require_galera(bool value); static void require_galera(bool value);
/** Require that columnstore is present*/
static void require_columnstore(bool value);
/** /**
* @brief Specify whether galera should be restarted. * @brief Specify whether galera should be restarted.
* *