Skip to content

Commit

Permalink
Updating script tests to hide 'Disable' message when run in parallel …
Browse files Browse the repository at this point in the history 
…in all slave processes while leaving it in the master process to declutter the output. (#1956)
  • Loading branch information
@bmarchant
bmarchant authored Nov 13, 2017
1 parent 1fb42e7 commit 941242d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 26 deletions.
8 changes: 6 additions & 2 deletions hoot-test/src/main/cpp/hoot/test/ScriptTestSuite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
namespace hoot
{

ScriptTestSuite::ScriptTestSuite(QString dir, bool printDiff, double waitTimeSec) : TestSuite(dir.toStdString())
ScriptTestSuite::ScriptTestSuite(QString dir, bool printDiff, double waitTimeSec, bool hideDisableTests)
: TestSuite(dir.toStdString())
{
QDir d(dir);
QStringList files = d.entryList(QDir::Files);
Expand Down Expand Up @@ -70,7 +71,10 @@ ScriptTestSuite::ScriptTestSuite(QString dir, bool printDiff, double waitTimeSec
{
if (fi.baseName().startsWith(ignorePrefix[j]))
{
LOG_WARN("Disabling: " << fi.filePath());
if (!hideDisableTests)
{
LOG_WARN("Disabling: " << fi.filePath());
}
ignore = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion hoot-test/src/main/cpp/hoot/test/ScriptTestSuite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace hoot
class ScriptTestSuite : public CppUnit::TestSuite
{
public:
ScriptTestSuite(QString dir, bool printDiff, double waitTime);
ScriptTestSuite(QString dir, bool printDiff, double waitTime, bool hideDisableTests);

private:
std::vector<boost::shared_ptr<ScriptTest> > _tests;
Expand Down
46 changes: 23 additions & 23 deletions hoot-test/src/main/cpp/hoot/test/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ enum _TimeOutValue
GLACIAL_WAIT = 900
};

void populateTests(_TestType t, CppUnit::TestSuite *suite, bool printDiff)
void populateTests(_TestType t, CppUnit::TestSuite *suite, bool printDiff, bool hideDisableTests = false)
{
/** This section is a bit verbose but ordering is very important as the order must go as follows:
* Default Registry
Expand All @@ -253,49 +253,49 @@ void populateTests(_TestType t, CppUnit::TestSuite *suite, bool printDiff)
default:
case CURRENT:
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("current").makeTest());
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT, hideDisableTests));
break;
case QUICK:
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("current").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("quick").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("TgsTest").makeTest());
break;
case QUICK_ONLY:
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("quick").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("TgsTest").makeTest());
break;
case SLOW:
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ConflateCaseTestSuite("test-files/cases"));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("current").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("quick").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("TgsTest").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("slow").makeTest());
break;
case SLOW_ONLY:
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ConflateCaseTestSuite("test-files/cases"));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("slow").makeTest());
break;
case GLACIAL:
case ALL:
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/", printDiff, GLACIAL_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/current/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/quick/", printDiff, QUICK_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/", printDiff, GLACIAL_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT, hideDisableTests));
suite->addTest(new ConflateCaseTestSuite("test-files/cases"));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("current").makeTest());
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("quick").makeTest());
Expand All @@ -304,13 +304,13 @@ void populateTests(_TestType t, CppUnit::TestSuite *suite, bool printDiff)
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("glacial").makeTest());
break;
case GLACIAL_ONLY:
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/", printDiff, GLACIAL_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/", printDiff, GLACIAL_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT, hideDisableTests));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("glacial").makeTest());
break;
case SERIAL:
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT));
suite->addTest(new ScriptTestSuite("test-files/cmd/glacial/serial/", printDiff, GLACIAL_WAIT, hideDisableTests));
suite->addTest(new ScriptTestSuite("test-files/cmd/slow/serial/", printDiff, SLOW_WAIT, hideDisableTests));
suite->addTest(CppUnit::TestFactoryRegistry::getRegistry("serial").makeTest());
break;
}
Expand Down Expand Up @@ -419,7 +419,7 @@ int main(int argc, char *argv[])
while (testName != HOOT_TEST_FINISHED)
{
rootSuite = new CppUnit::TestSuite( "All tests" );
populateTests(ALL, rootSuite, printDiff);
populateTests(ALL, rootSuite, printDiff, true);
CppUnit::Test* t = rootSuite->findTest(testName);
if (t != 0)
{
Expand Down Expand Up @@ -534,7 +534,7 @@ int main(int argc, char *argv[])
nameCheck.insert(*it);
// Add all of the jobs that must be done serially and are a part of the selected tests
CppUnit::TestSuite serialTests;
populateTests(SERIAL, &serialTests, printDiff);
populateTests(SERIAL, &serialTests, printDiff, true);
vector<string> serialNames;
getNames(serialNames, &serialTests);
for (vector<string>::iterator it = serialNames.begin(); it != serialNames.end(); ++it)
Expand Down

0 comments on commit 941242d

Please sign in to comment.