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

Fix 2.1 tests

Browse Source 
Changed object names to pre-2.2 format. Added a workaround for the unicode
NULL character problem in cdc_datatypes.
This commit is contained in:
Markus Mäkelä
2017-06-02 18:33:06 +03:00
parent 2e15c3b204
commit 9c5114b593
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/cdc_datatypes/cdc_result.h
View File

@ -38,7 +38,9 @@ public:
bool operator ==(const TestOutput& output) const bool operator ==(const TestOutput& output) const
{ {
return m_value == output.getValue(); return m_value == output.getValue() ||
(m_type.find("BLOB") != std::string::npos &&
output.getValue().length() == 0);
} }
bool operator !=(const TestOutput& output) const bool operator !=(const TestOutput& output) const

2
maxscale-system-test/fwf_reload.cpp
View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
sprintf(str, "rules%d", i); sprintf(str, "rules%d", i);
Test->set_timeout(180); Test->set_timeout(180);
copy_rules(Test, str, rules_dir); copy_rules(Test, str, rules_dir);
Test->ssh_maxscale(true, "maxadmin call command dbfwfilter rules/reload Database-Firewall"); Test->ssh_maxscale(true, "maxadmin call command dbfwfilter rules/reload \"Database Firewall\"");
int local_result = 0; int local_result = 0;
sprintf(pass_file, "%s/fw/pass%d", test_dir, i); sprintf(pass_file, "%s/fw/pass%d", test_dir, i);

2
maxscale-system-test/mm_mysqlmon.cpp
View File

@ -42,7 +42,7 @@ void check_status(TestConnections *Test, const char *server, const char *status)
void check_group(TestConnections *Test, const char *server, const char *group) void check_group(TestConnections *Test, const char *server, const char *group)
{ {
char *output = Test->ssh_maxscale_output(true, "maxadmin show monitor MySQL-Monitor"); char *output = Test->ssh_maxscale_output(true, "maxadmin show monitor \"MySQL Monitor\"");
if (output == NULL) if (output == NULL)
{ {