Skip to content

Add support for disabling test cases. #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add support for disabling test cases. #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6d38a
Add support for disabling test cases.
lkarsten Jul 27, 2017
e9a6d9a
Add support for disabled test cases.
lkarsten Aug 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions test/regression/regression.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
std::vector<RegressionTest *> *tests,
ModSecurityTestResults<RegressionTestResult> *res, int *count) {


for (RegressionTest *t : *tests) {
CustomDebugLog *debug_log = new CustomDebugLog();
modsecurity::ModSecurity *modsec = NULL;
Expand All @@ -102,6 +101,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
ModSecurityTestResults<RegressionTest> r;
std::stringstream serverLog;
RegressionTestResult *testRes = new RegressionTestResult();

testRes->test = t;
r.status = 200;
(*count)++;
Expand All @@ -122,6 +122,19 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
std::cout << std::setw(70) << std::left << t->name;
}

if (t->enabled == 0) {
if (test->m_automake_output) {
std::cout << ":test-result: disabled" << filename \
<< ":" << t->name << std::endl;
} else {
std::cout << KCYN << "disabled" << RESET << std::endl;
}
res->push_back(testRes);
testRes->disabled = true;
testRes->reason << "JSON disabled";
continue;
}

modsec = new modsecurity::ModSecurity();
modsec->setConnectorInformation("ModSecurity-regression v0.0.1-alpha" \
" (ModSecurity regression test utility)");
Expand Down Expand Up @@ -470,17 +483,22 @@ int main(int argc, char **argv) {

int passed = 0;
int failed = 0;
int disabled = 0;
int skipped = 0;

for (RegressionTestResult *r : res) {
if (r->skipped == true) {
skipped++;
}
if (r->passed == true && r->skipped == false) {
if (r->disabled == true) {
disabled++;
}
if (r->passed == true) {
passed++;
} else if (r->skipped == false) {
if (test.m_automake_output) {
// m_automake_output
} else {
}

if (!r->passed && !r->skipped && !r->disabled) {
if (!test.m_automake_output) {
std::cout << KRED << "Test failed." << RESET << KWHT \
<< " From: " \
<< RESET << r->test->filename << "." << std::endl;
Expand All @@ -499,18 +517,16 @@ int main(int argc, char **argv) {
std::cout << "Ran a total of: " << std::to_string(failed + passed) \
<< " regression tests - ";
if (failed == 0) {
std::cout << KGRN << "All tests passed." << RESET;
std::cout << KGRN << "All tests passed. " << RESET;
} else {
std::cout << KRED << failed << " failed." << RESET;
std::cout << KRED << failed << " failed. " << RESET;
}

if (skipped > 0) {
std::cout << KCYN << " " << std::to_string(skipped) << " ";
std::cout << "skipped tests." << RESET << std::endl;
} else {
std::cout << std::endl;
}
std::cout << KCYN << std::to_string(skipped) << " ";
std::cout << "skipped test(s). " << std::to_string(disabled) << " ";
std::cout << "disabled test(s)." << RESET << std::endl;
}

for (std::pair<std::string, std::vector<RegressionTest *> *> a : test) {
std::vector<RegressionTest *> *vec = a.second;
for (int i = 0; i < vec->size(); i++) {
Expand Down
2 changes: 2 additions & 0 deletions test/regression/regression_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ class RegressionTestResult {
RegressionTestResult() :
passed(false),
skipped(false),
disabled(false),
test(NULL) { }

bool passed;
bool skipped;
bool disabled;
RegressionTest *test;
std::stringstream reason;
};
Expand Down