Fix lint

Also re-enable unit tests for the resident utilities etc.

.travis.yml

@@ -1,10 +1,17 @@
 sudo: true
 dist: xenial
 language: python
-python:
-  - "3.6"
 install: pip install tox-travis
-env:
-  - ENV=pep8
+matrix:
+  include:
+    - name: "Python 3.5"
+      python: 3.5
+      env: ENV=pep8,py3
+    - name: "Python 3.6"
+      python: 3.6
+      env: ENV=pep8,py3
+    - name: "Python 3.7"
+      python: 3.7
+      env: ENV=pep8,py3
 script:
-  - tox -c tox.ini -e $ENV
+  - tox -c tox.ini -e $ENV

zaza/openstack/charm_tests/test_utils.py

@@ -168,7 +168,8 @@ class OpenStackBaseTest(unittest.TestCase):
         model.block_until_all_units_idle()
 
     def restart_on_changed(self, config_file, default_config, alternate_config,
-                           default_entry, alternate_entry, services, pgrep_full=False):
+                           default_entry, alternate_entry, services,
+                           pgrep_full=False):
         """Run restart on change tests.
 
         Test that changing config results in config file being updates and