diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_policyhandler.py | 5 | ||||
| -rw-r--r-- | tests/test_step_timer.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/test_policyhandler.py b/tests/test_policyhandler.py index f2dd9eb..a775ea7 100644 --- a/tests/test_policyhandler.py +++ b/tests/test_policyhandler.py @@ -46,7 +46,6 @@ from policyhandler.web_server import _PolicyWeb from .mock_settings import Settings - Settings.init() class MonkeyHttpResponse(object): @@ -603,6 +602,7 @@ class WebServerTest(CPWebCase): result = self.getPage("/healthcheck") Settings.logger.info("healthcheck result: %s", result) + WebServerTest.do_gc_test = False Settings.logger.info("shutdown...") result = self.getPage("/shutdown") Settings.logger.info("shutdown result: %s", result) @@ -610,6 +610,7 @@ class WebServerTest(CPWebCase): Settings.logger.info("got shutdown: %s", self.body) time.sleep(1) + @pytest.mark.usefixtures("fix_pdp_post_boom") class WebServerPDPBoomTest(CPWebCase): """testing the web-server - runs tests in alphabetical order of method names""" @@ -761,6 +762,7 @@ class WebServerPDPBoomTest(CPWebCase): result = self.getPage("/healthcheck") Settings.logger.info("healthcheck result: %s", result) + WebServerPDPBoomTest.do_gc_test = False Settings.logger.info("shutdown...") result = self.getPage("/shutdown") Settings.logger.info("shutdown result: %s", result) @@ -920,6 +922,7 @@ class WebServerInternalBoomTest(CPWebCase): result = self.getPage("/healthcheck") Settings.logger.info("healthcheck result: %s", result) + WebServerInternalBoomTest.do_gc_test = False Settings.logger.info("shutdown...") result = self.getPage("/shutdown") Settings.logger.info("shutdown result: %s", result) diff --git a/tests/test_step_timer.py b/tests/test_step_timer.py index 808f99e..ff89388 100644 --- a/tests/test_step_timer.py +++ b/tests/test_step_timer.py @@ -80,7 +80,7 @@ class MockTimerController(object): MockTimerController.logger.info("verify exe %s for %s", self.exe_interval, self.get_status()) - assert self.exe_interval >= self.interval + assert self.exe_interval >= (self.interval - 0.01) assert self.exe_interval < 2 * self.interval MockTimerController.logger.info("success %s", self.get_status()) |