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

Make sure created event is dropped before exiting

Browse Source 
Tests should clean up after themselves and in the case of this event, it
can cause problems with other tests.
This commit is contained in:
Markus Mäkelä 2018-11-01 12:18:15 +02:00
parent f8c132903b
commit 49587d78d8
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/mysqlmon_fail_switch_events.cpp
View File

@ -162,7 +162,7 @@ int main(int argc, char** argv)
// If initialisation failed, fail the test immediately.
if (test.global_result != 0)
{
delete_event(test);
try_delete_event(test);
return test.global_result;
}
@ -182,7 +182,7 @@ int main(int argc, char** argv)
// Again, stop on failure.
if (test.global_result != 0)
{
delete_event(test);
try_delete_event(test);
return test.global_result;
}
@ -206,7 +206,7 @@ int main(int argc, char** argv)
if (test.global_result != 0)
{
delete_event(test);
try_delete_event(test);
return test.global_result;
}
@ -225,7 +225,7 @@ int main(int argc, char** argv)
check_event_status(test, 0, EVENT_NAME, "ENABLED");
if (test.global_result != 0)
{
delete_event(test);
try_delete_event(test);
return test.global_result;
}
@ -237,7 +237,7 @@ int main(int argc, char** argv)
test.expect(states.count("Slave") == 1, "%s is not a slave.", server_name.c_str());
}
delete_event(test);
try_delete_event(test);
if (test.global_result != 0)
{
test.repl->fix_replication();