Skip to content

Commit

Permalink
Merge pull request #62 from rinslow/feature/too-many-files-open
Browse files Browse the repository at this point in the history
Fixed too many files open issue.
  • Loading branch information
UnDarkle committed May 20, 2018
2 parents 6989cd0 + 044b1fd commit 0bc5239
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 0 additions & 2 deletions src/rotest/core/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ def __init__(self, indexer=count(), base_work_dir=ROTEST_WORK_DIR,
force_initialize=force_initialize,
resource_manager=resource_manager)

self.logger.debug("Initialized %r test-block successfully", self.data)

@classmethod
def get_name(cls, **parameters):
"""Return test name.
Expand Down
3 changes: 0 additions & 3 deletions src/rotest/core/flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,13 @@ def __init__(self, base_work_dir=ROTEST_WORK_DIR, save_state=True,
base_work_dir=self.work_dir,
resource_manager=self.resource_manager)

self.logger.debug("Adding %r to tests", test_item)
self._tests.append(test_item)

self.share_data(override_previous=False, **self.__class__.common)

if self.is_main:
self._validate_inputs()

self.logger.debug("Initialized %r test-flow successfully", self.data)

def __iter__(self):
return iter(self._tests)

Expand Down
3 changes: 0 additions & 3 deletions src/rotest/core/flow_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

from rotest.common import core_log
from rotest.common.utils import get_work_dir
from rotest.common.log import get_test_logger
from rotest.common.config import ROTEST_WORK_DIR
from rotest.core.abstract_test import AbstractTest
from rotest.management.common.errors import ServerError
Expand Down Expand Up @@ -137,8 +136,6 @@ def __init__(self, indexer=count(), base_work_dir=ROTEST_WORK_DIR,
self.work_dir = get_work_dir(base_work_dir, name)
self.data = CaseData(name=name, run_data=run_data)

self.logger = get_test_logger(repr(self.data), self.work_dir)

if self.resource_manager is None:
self.resource_manager = self.create_resource_manager()
self._is_client_local = True
Expand Down
10 changes: 10 additions & 0 deletions src/rotest/core/result/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import pkg_resources

from rotest.common import core_log
from rotest.common.log import get_test_logger
from rotest.core.models.case_data import TestOutcome
from rotest.core.flow_component import AbstractFlowComponent

Expand Down Expand Up @@ -69,6 +70,7 @@ def startTest(self, test):
if not isinstance(test, AbstractFlowComponent) or test.is_main:
super(Result, self).startTest(test)

test.logger = get_test_logger(repr(test.data), test.work_dir)
test.logger.info("Test %r has started running", test.data)
test.start()

Expand Down Expand Up @@ -136,10 +138,18 @@ def stopTest(self, test):
super(Result, self).stopTest(test)

test.logger.debug("Test %r has stopped running", test.data)

test.data.end()
for result_handler in self.result_handlers:
result_handler.stop_test(test)

# In order to avoid having too many open files we close the log file
# handlers at the end of each test.
handlers = test.logger.handlers[:]
for handler in handlers:
handler.close()
test.logger.removeHandler(handler)

def startComposite(self, test):
"""Called when the given TestSuite is about to be run.
Expand Down

0 comments on commit 0bc5239

Please sign in to comment.