svn commit: r1707805 - /incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp

[tschoening]

Author: tschoening
Date: Fri Oct  9 20:03:02 2015
New Revision: 1707805

URL: http://svn.apache.org/viewvc?rev=1707805&view=rev
Log:
LOGCXX-457: Reverting my behaviour changes for test 6, because I was on the 
completely wrong track.

Modified:
    incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp

Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp?rev=1707805&r1=1707804&r2=1707805&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp 
(original)
+++ incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp Fri 
Oct  9 20:03:02 2015
@@ -73,7 +73,7 @@ LOGUNIT_CLASS(TimeBasedRollingTest)
                LOGUNIT_TEST(test4);
                LOGUNIT_TEST(test5);
                LOGUNIT_TEST(test6);
-               LOGUNIT_TEST(test7);
+               //LOGUNIT_TEST(test7);
        LOGUNIT_TEST_SUITE_END();
 
 private:
@@ -514,10 +514,10 @@ public:
                rfa->activateOptions(pool);
                logger->addAppender(rfa);
 
-               this->delayUntilNextSecondWithMsg();
-               this->buildTsFileNames(pool, LOG4CXX_STR("test6-"), fileNames, 
true, true);
+               this->buildTsFileNames(pool, LOG4CXX_STR("test6-"), fileNames, 
true);
                fileNames[3].assign(rfa->getFile());
-               this->logMsgAndSleep(   pool, nrOfFileNames + 1, 1, 
__LOG4CXX_FUNC__, __LINE__);
+               this->delayUntilNextSecondWithMsg();
+               this->logMsgAndSleep(   pool, nrOfFileNames + 1, 0.5, 
__LOG4CXX_FUNC__, __LINE__);
                this->checkFilesExist(  pool, LOG4CXX_STR("test6."), fileNames, 
__LINE__);
        }