Fix pep8 on test files

Alignak-monitoring · Sep 12, 2016 · f2254e3 · f2254e3
1 parent 8778a40
commit f2254e3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 43 deletions.
diff --git a/test/test_dependencies.py b/test/test_dependencies.py
@@ -49,8 +49,8 @@ def test_conf_dependencies(self):
         # test test_host_00.test_ok_1 -> test_host_00
         # test test_host_00.test_ok_1 -> test_host_00.test_ok_0
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_00",
-                                                                          "test_ok_1")
-        for (dep_id, status, n_type, _, _) in svc.act_depend_of:
+                                                                              "test_ok_1")
+        for (dep_id, _, n_type, _, _) in svc.act_depend_of:
             if n_type == 'network_dep':
                 self.assertEqual(self.schedulers[0].sched.hosts[dep_id].host_name, 'test_host_00')
             elif n_type == 'logic_dep':
@@ -75,8 +75,8 @@ def test_conf_dependencies(self):
 
         # test test_host_11.test_parent_svc -> test_host_11.test_son_svc
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_11",
-                                                                          "test_parent_svc")
-        for (dep_id, status, n_type, _, _) in svc.act_depend_of:
+                                                                              "test_parent_svc")
+        for (dep_id, _, n_type, _, _) in svc.act_depend_of:
             if n_type == 'network_dep':
                 self.assertEqual(self.schedulers[0].sched.hosts[dep_id].host_name, 'test_host_11')
             elif n_type == 'logic_dep':
@@ -85,8 +85,8 @@ def test_conf_dependencies(self):
 
         # test test_host_11.test_ok_1 -> test_host_11.test_ok_0
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_11",
-                                                                          "test_ok_1")
-        for (dep_id, status, n_type, _, _) in svc.act_depend_of:
+                                                                              "test_ok_1")
+        for (dep_id, _, n_type, _, _) in svc.act_depend_of:
             if n_type == 'network_dep':
                 self.assertEqual(self.schedulers[0].sched.hosts[dep_id].host_name, 'test_host_11')
             elif n_type == 'logic_dep':
@@ -184,7 +184,7 @@ def test_service_host_case_1(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_00",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -249,7 +249,7 @@ def test_service_host_host(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_00",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -295,7 +295,7 @@ def test_multi_services(self):
         host.event_handler_enabled = False
 
         svc1 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_00",
-                                                                           "test_ok_0")
+                                                                               "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc1.notification_interval = 0.001
         svc1.checks_in_progress = []
@@ -340,7 +340,7 @@ def test_passive_service_not_check_passive_host(self):
 
         host = self.schedulers[0].sched.hosts.find_by_name("test_host_E")
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_E",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
 
         self.scheduler_loop(1, [[host, 0, 'UP'], [svc, 0, 'OK']])
 
@@ -362,7 +362,7 @@ def test_passive_service_check_active_host(self):
 
         host = self.schedulers[0].sched.hosts.find_by_name("test_host_00")
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_00",
-                                                                          "test_passive_0")
+                                                                              "test_passive_0")
 
         self.scheduler_loop(1, [[host, 0, 'UP'], [svc, 0, 'OK']])
 

diff --git a/test/test_dispatcher.py b/test/test_dispatcher.py
@@ -230,12 +230,9 @@ def test_simple_scheduler_spare(self):
 
             self.setup_with_file('cfg/cfg_dispatcher_scheduler_spare.cfg')
             master_index = -1
-            spare_index = -1
             for index, scheduler in enumerate(self.schedulers):
                 if hasattr(scheduler, 'conf'):
                     master_index = index
-                else:
-                    spare_index = index
             self.assertGreater(master_index, -1)
 
             json_managed = {self.schedulers[master_index].conf.uuid:

diff --git a/test/test_eventhandler.py b/test/test_eventhandler.py
@@ -51,7 +51,7 @@ def test_ok_critical_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False
@@ -108,7 +108,7 @@ def test_ok_warning_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False
@@ -166,7 +166,7 @@ def test_ok_warning_critical_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False
@@ -249,7 +249,7 @@ def test_ok_warning_s_critical_h_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False
@@ -306,7 +306,7 @@ def test_ok_critical_s_warning_h_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False
@@ -364,7 +364,7 @@ def test_ok_critical_s_warning_h_warning_h_ok(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
         svc.enable_notifications = False

diff --git a/test/test_notifications.py b/test/test_notifications.py
@@ -45,7 +45,7 @@ def test_0_nonotif(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.checks_in_progress = []
         svc.act_depend_of = []  # no hostchecks on critical checkresults
 
@@ -86,7 +86,7 @@ def test_1_nonotif_enablewithcmd(self):
         host.act_depend_of = []  # ignore the router
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -144,7 +144,7 @@ def test_2_notifications(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -215,7 +215,7 @@ def test_3_notifications(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -271,7 +271,7 @@ def test_4_notifications(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -321,7 +321,7 @@ def test_notifications_with_delay(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         svc.notification_interval = 0.001  # and send immediately then
         svc.first_notification_delay = 0.1  # set 6s for first notification delay
         svc.checks_in_progress = []
@@ -395,7 +395,7 @@ def test_notifications_outside_period(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -441,7 +441,7 @@ def test_notifications_ack(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []
@@ -507,7 +507,7 @@ def test_notifications_downtime(self):
         host.event_handler_enabled = False
 
         svc = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_0",
-                                                                          "test_ok_0")
+                                                                              "test_ok_0")
         # To make tests quicker we make notifications send very quickly
         svc.notification_interval = 0.001
         svc.checks_in_progress = []

diff --git a/test/test_passive_checks.py b/test/test_passive_checks.py
@@ -73,15 +73,15 @@ def test_1_freshness_state(self):
         host_d = self.schedulers[0].sched.hosts.find_by_name("test_host_D")
 
         svc0 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_0")
+                                                                               "test_ok_0")
         svc1 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_1")
+                                                                               "test_ok_1")
         svc2 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_2")
+                                                                               "test_ok_2")
         svc3 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_3")
+                                                                               "test_ok_3")
         svc4 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_4")
+                                                                               "test_ok_4")
 
         self.assertEqual("d", host_a.freshness_state)
         self.assertEqual("u", host_b.freshness_state)
@@ -115,15 +115,15 @@ def test_2_freshness_expiration(self):
         host_d.last_state_update = int(time.time()) - 10000
 
         svc0 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_0")
+                                                                               "test_ok_0")
         svc1 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_1")
+                                                                               "test_ok_1")
         svc2 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_2")
+                                                                               "test_ok_2")
         svc3 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_3")
+                                                                               "test_ok_3")
         svc4 = self.schedulers[0].sched.services.find_srv_by_name_and_hostname("test_host_A",
-                                                                           "test_ok_4")
+                                                                               "test_ok_4")
 
         svc0.last_state_update = int(time.time()) - 10000
         svc1.last_state_update = int(time.time()) - 10000
@@ -149,8 +149,8 @@ def test_2_freshness_expiration(self):
         self.assertEqual("UP", host_c.state)
         self.assertEqual("DOWN", host_d.state)
 
-        all = [svc0, svc1, svc2, svc3, svc4, host_a, host_b, host_c, host_d]
-        for item in all:
+        items = [svc0, svc1, svc2, svc3, svc4, host_a, host_b, host_c, host_d]
+        for item in items:
             self.assertEqual("Freshness period expired", item.output)
 
         self.assert_actions_count(0)

diff --git a/test/test_unserialize_in_daemons.py b/test/test_unserialize_in_daemons.py
@@ -23,10 +23,9 @@
 This file test unserialisation of data
 """
 
-
 import unittest
 
-from alignak import bin
+
 from alignak.misc.serialization import unserialize