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

Refactor fwf_syntax

Browse Source 
Use stack allocated classes, check return value of the start command and
combine the rule creation function.
This commit is contained in:
Markus Mäkelä
2017-09-19 14:22:35 +03:00
parent 049eb68254
commit cda1fdc26a
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
maxscale-system-test/fwf_syntax.cpp
View File

@ -41,45 +41,41 @@ const char *rules_failure[] =
NULL NULL
}; };
void truncate_maxscale_logs(TestConnections *test) void truncate_maxscale_logs(TestConnections& test)
{ {
test->ssh_maxscale(true, "truncate -s 0 /var/log/maxscale/*"); test.ssh_maxscale(true, "truncate -s 0 /var/log/maxscale/*");
} }
void add_rule(const char *rule) void create_rule(const char *rule, const char* user)
{ {
FILE *file = fopen(temp_rules, "a"); FILE *file = fopen(temp_rules, "a");
fprintf(file, "%s\n", rule); fprintf(file, "%s\n", rule);
fprintf(file, "%s\n", user);
fclose(file); fclose(file);
} }
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
TestConnections::skip_maxscale_start(true); TestConnections::skip_maxscale_start(true);
TestConnections *test = new TestConnections(argc, argv); TestConnections test(argc, argv);
test->stop_timeout(); test.stop_maxscale();
test->stop_maxscale();
for (int i = 0; rules_failure[i]; i++) for (int i = 0; rules_failure[i]; i++)
{ {
/** Create rule file with syntax error */ /** Create rule file with syntax error */
truncate(temp_rules, 0); truncate(temp_rules, 0);
add_rule(rules_failure[i]); create_rule(rules_failure[i], users_ok[0]);
add_rule(users_ok[0]); copy_rules(&test, (char*)temp_rules, (char*)test_dir);
copy_rules(test, (char*)temp_rules, (char*)test_dir);
test->tprintf("Testing rule: %s\n", rules_failure[i]); test.tprintf("Testing rule: %s\n", rules_failure[i]);
test->start_maxscale(); test.add_result(test.start_maxscale() == 0, "MaxScale should fail to start");
sleep(3);
/** Check that MaxScale did not start and that the log contains /** Check that MaxScale did not start and that the log contains
* a message about the syntax error. */ * a message about the syntax error. */
test->check_maxscale_processes(0); test.check_maxscale_processes(0);
test->check_log_err("syntax error", true); test.check_log_err("syntax error", true);
truncate_maxscale_logs(test); truncate_maxscale_logs(test);
} }
int rval = test->global_result; return test.global_result;
delete test;
return rval;
} }