diff --git a/.travis.yml b/.travis.yml index 050071177..f60a5e6f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,6 @@ matrix: - python: "2.6" env: TEST_SUITE=virtualenv -services: - - mongodb - install: # Remove python warnings - unset PYTHONWARNINGS diff --git a/test_run/test_launch_daemons_modules.py b/test_run/test_launch_daemons_modules.py index c4daee9c8..140e3871c 100644 --- a/test_run/test_launch_daemons_modules.py +++ b/test_run/test_launch_daemons_modules.py @@ -270,9 +270,9 @@ def test_daemons_modules(self): nb_errors = self._run_daemons_modules(cfg_folder=cfg_folder, tmp_folder='./run/test_launch_daemons_modules_1', cfg_modules=cfg_modules) + self.kill_daemons() assert nb_errors == 0, "Error logs raised!" print("No error logs raised when daemons started and loaded the modules") - self.kill_daemons() @pytest.mark.skipif(sys.version_info[:2] < (2, 7), reason="Not available for Python < 2.7") def test_daemons_modules_logs(self): @@ -294,6 +294,8 @@ def test_daemons_modules_logs(self): 'poller': '', 'reactionner': '', 'receiver': '' } nb_errors = self._run_daemons_modules(cfg_folder, tmp_folder, cfg_modules, 10) + self.kill_daemons() + assert nb_errors == 0, "Error logs raised!" print("No error logs raised when daemons started and loaded the modules") @@ -310,7 +312,6 @@ def test_daemons_modules_logs(self): [1496076886] INFO: TIMEPERIOD TRANSITION: workhours;-1;1 """ assert count >= 2 - self.kill_daemons() @pytest.mark.skipif(sys.version_info[:2] < (2, 7), reason="Not available for Python < 2.7") def test_daemons_modules_logs_restart_module(self):