From 976231a58d7c96f9ff2508fe15e6279f75bfba22 Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Wed, 31 Aug 2016 10:05:38 -0400
Subject: [PATCH] Temporarily Disable Linters

This change should disable the Ansible Linters in tox.ini
so that we can make the existing pep8 tests voting.

Linting should be re-enabled in tox once Ansible playbooks
have their errors corrected.

This commit also corrects some python errors that snuck into
Shaker.py

Change-Id: I5d64985849b9e31b91c9000dba7238cc79bd2009
---
 bindep.txt                                                  | 4 ++++
 lib/Shaker.py                                               | 6 +++---
 .../nova-create-pbench-uperf/nova-create-pbench-uperf.py    | 5 +++--
 tox.ini                                                     | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 4f9b42547..5c170cb9f 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,2 +1,6 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
+libffi-dev [platform:dpkg]
+libffi-devel [platform:rpm]
+virtual/libffi [platform:gentoo]
+
diff --git a/lib/Shaker.py b/lib/Shaker.py
index 1a9c91f14..36a7283ca 100644
--- a/lib/Shaker.py
+++ b/lib/Shaker.py
@@ -405,8 +405,8 @@ class Shaker(WorkloadBase.WorkloadBase):
                         test_time = default_time
                     for interval in range(0, test_time + 9):
                         es_list.append(
-                                       datetime.datetime.utcnow() +
-                                       datetime.timedelta(0,interval))
+                            datetime.datetime.utcnow() +
+                            datetime.timedelta(0,interval))
 
                     for run in range(self.config['browbeat']['rerun']):
                         self.logger.info("Scenario: {}".format(scenario['name']))
@@ -427,7 +427,7 @@ class Shaker(WorkloadBase.WorkloadBase):
                             time_stamp1, "shaker", scenario['name'], run)
                         self.run_scenario(
                             scenario, result_dir, test_name, fname, shaker_uuid,
-                        es_ts, es_list, run)
+                            es_ts, es_list, run)
                         self.get_stats()
                 else:
                     self.logger.info(
diff --git a/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py b/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
index bd3e045b3..9bbfcb541 100644
--- a/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
+++ b/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
@@ -142,7 +142,8 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario,
                     user, sip)
                 s1_exitcode, s1_stdout, s1_stderr = jump_ssh.execute(cmd)
                 if retry < 1:
-                    LOG.error("Error : Issue reaching {} the guests through the Jump host".format(sip))
+                    LOG.error(
+                        "Error : Issue reaching {} the guests through the Jump host".format(sip))
                     return 1
                 if s1_exitcode is 0:
                     ready = True
@@ -157,7 +158,7 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario,
             self._run_command_over_ssh(jump_ssh, {'remote_path': cmd})
 
         # Quick single test
-        #debug = "--message-sizes=1024 --instances=1"
+        # debug = "--message-sizes=1024 --instances=1"
         debug = None
 
         # Start uperf against private address
diff --git a/tox.ini b/tox.ini
index 5c5cc1355..de60a7289 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,8 +22,8 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
 whitelist_externals = bash
 commands =
   flake8
-  bash -c "cd ansible; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
-    ansible-lint"
+#  bash -c "cd ansible; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
+#    ansible-lint"
 
 [testenv:pep8]
 commands = flake8 {posargs} --exclude=ansible