From 2a9af3de0adfb9ebd736a48afe9e04aa78bad6a7 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 5 May 2019 16:56:49 -0400 Subject: [PATCH] Fix memory leak in PRS1 unit test. Test runs now produce reproducible output. This fix also seems like it cleans up some of the weird session IDs. It appears that session IDs were sticking around after each machine, adding those IDs or sessions to subsequent machines in that run of the test. Since the test was being run piecemeal while under development, this produced different behavior when being run with different segments of the data. --- oscar/tests/prs1tests.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp index de0e0963..f1cfd470 100644 --- a/oscar/tests/prs1tests.cpp +++ b/oscar/tests/prs1tests.cpp @@ -51,9 +51,11 @@ void parseAndEmitSessionYaml(const QString & path) // Each session now has a PRS1Import object in m_tasklist QList::iterator i; - for (i = s_loader->m_tasklist.begin(); i != s_loader->m_tasklist.end(); i++) { + while (!s_loader->m_tasklist.isEmpty()) { + ImportTask* task = s_loader->m_tasklist.takeFirst(); + // Run the parser - PRS1Import* import = dynamic_cast(*i); + PRS1Import* import = dynamic_cast(task); import->ParseSession(); // Emit the parsed session data to compare against our regression benchmarks @@ -62,7 +64,7 @@ void parseAndEmitSessionYaml(const QString & path) SessionToYaml(outpath, session); delete session; - //delete import; // TODO: this crashes: there's a bug in the loader somewhere + delete task; } }