github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix various minor bugs in the regression test suite

Browse Source 
Now if a test fails it keep testing the others tests from the same
family. The output was also improved.
This commit is contained in:
Felipe Zimmerle
2015-12-10 18:36:20 -03:00
parent 42ce0475b2
commit 2a950a435b
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/regression/regression.cc
View File

@@ -129,14 +129,17 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
}
if (modsec_rules->load(t->rules.c_str(), filename) < 0) {
/* Parser error */
if (t->parser_error.empty() == true) {
/* Not expecting any error, thus return the error to the user. */
std::cout << KRED << "failed!" << RESET << std::endl;
testRes->reason << KRED << "parse failed." << RESET \
<< std::endl;
testRes->reason << modsec_rules->getParserError() \
<< std::endl;
testRes->passed = false;
res->push_back(testRes);
return;
continue;
}
Regex re(t->parser_error);
@@ -144,10 +147,16 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
std::string s = modsec_rules->getParserError();
if (regex_search(s, &match, re) && match.size() >= 1) {
std::cout << KGRN << "passed!" << RESET << std::endl;
/* Parser error was expected, thus, the test passed. */
testRes->reason << KGRN << "passed!" << RESET << std::endl;
testRes->passed = true;
return;
res->push_back(testRes);
continue;
} else {
/* Parser error was expected, but with a different content */
std::cout << KRED << "failed!" << RESET << std::endl;
testRes->reason << KRED << "failed!" << RESET << std::endl;
testRes->reason << KWHT << "Expected a parser error." \
<< RESET << std::endl;
@@ -156,17 +165,20 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
testRes->reason << KWHT << "Produced: " << RESET \
<< s << std::endl;
testRes->passed = false;
return;
res->push_back(testRes);
continue;
}
} else {
/* Parser error was expected but never happened */
if (t->parser_error.empty() == false) {
std::cout << KRED << "failed!" << std::endl;
std::cout << KRED << "failed!" << RESET << std::endl;
std::cout << KWHT << "Expected a parser error." \
<< RESET << std::endl;
std::cout << KWHT << "Expected: " << RESET \
<< t->parser_error << std::endl;
testRes->passed = false;
res->push_back(testRes);
continue;
}
}