commit 9b02c8bb4541e1524608bc700189f1c34bd7e162
author Dennis Dmitriev <ddmitriev@mirantis.com> Mon Nov 13 15:31:35 2017 +0200
committer Dennis Dmitriev <dis.xcom@gmail.com> Mon Nov 13 09:07:45 2017 -0500
tree 0b473777d1ebdf514c02c70b71ddd670d1127bc6
parent 8b70b904d110b910586070ffb747434c0b2835d6

Fix tox.ini to run unit tests on CI

Change-Id: I64a998b04e432397dcb34f70e7a0167374147eef

tcp_tests/tests/system/test_failover.py

diff --git a/tcp_tests/tests/system/test_failover.py b/tcp_tests/tests/system/test_failover.py
index 11173ce..9007eba 100644
--- a/tcp_tests/tests/system/test_failover.py
+++ b/tcp_tests/tests/system/test_failover.py
@@ -52,7 +52,7 @@
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     def test_restart_ctl01_node(self, underlay, openstack_deployed,
-                                      openstack_actions, show_step):
+                                openstack_actions, show_step):
         """Test restart ctl01
 
         Scenario:
@@ -353,9 +353,9 @@
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     def test_stop_influxdb_relay_mon_nodes(self, underlay,
-                                            openstack_deployed,
-                                            openstack_actions,
-                                            sl_deployed):
+                                           openstack_deployed,
+                                           openstack_actions,
+                                           sl_deployed):
         """Test stop influxdb relay on mon01 node
 
         Scenario:
@@ -412,9 +412,9 @@
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     def test_stop_influxdb_mon_nodes(self, underlay,
-                                      openstack_deployed,
-                                      openstack_actions,
-                                      sl_deployed):
+                                     openstack_deployed,
+                                     openstack_actions,
+                                     sl_deployed):
         """Test stop influxdb on mon01 node
 
         Scenario:
@@ -458,7 +458,7 @@
         assert 'mymeas' in sl_deployed.check_data_in_influxdb('mon01')
         assert 'mymeas' in sl_deployed.check_data_in_influxdb('mon02')
         # STEP #10
-      
+
         after_result = sl_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
             'tests/prometheus/', 'test_alerts.py')

tcp_tests/tests/system/test_install_k8s.py

diff --git a/tcp_tests/tests/system/test_install_k8s.py b/tcp_tests/tests/system/test_install_k8s.py
index 2294cf6..018f561 100644
--- a/tcp_tests/tests/system/test_install_k8s.py
+++ b/tcp_tests/tests/system/test_install_k8s.py
@@ -89,7 +89,7 @@
             current_targets = prometheus_client.get_targets()
             LOG.debug('Current targets after install {0}'
                       .format(current_targets))
-        except:
+        except Exception:
             LOG.warning('Restarting keepalived service on mon nodes...')
             sl_actions._salt.local(tgt='mon*', fun='cmd.run',
                                    args='systemctl restart keepalived')
@@ -151,7 +151,7 @@
             current_targets = prometheus_client.get_targets()
             LOG.debug('Current targets after install {0}'
                       .format(current_targets))
-        except:
+        except Exception:
             LOG.warning('Restarting keepalived service on mon nodes...')
             sl_actions._salt.local(tgt='mon*', fun='cmd.run',
                                    args='systemctl restart keepalived')

tcp_tests/tests/system/test_virtlet_actions.py

diff --git a/tcp_tests/tests/system/test_virtlet_actions.py b/tcp_tests/tests/system/test_virtlet_actions.py
index 99d6389..775eb5b 100644
--- a/tcp_tests/tests/system/test_virtlet_actions.py
+++ b/tcp_tests/tests/system/test_virtlet_actions.py
@@ -67,8 +67,8 @@
         target_memory_kb = target_memory * 1024
         target_yaml = 'virtlet/examples/cirros-vm-exp.yaml'
         k8s_deployed.adjust_cirros_resources(cpu=target_cpu,
-                                                memory=target_memory,
-                                                target_yaml=target_yaml)
+                                             memory=target_memory,
+                                             target_yaml=target_yaml)
         show_step(2)
         vm_name = k8s_deployed.run_vm(target_yaml)
         k8s_deployed.wait_active_state(vm_name)