Use pep8 v1.3.3

Fixed indents which violate pep8 1.3.3
Also added .mailmap file to coalesce commits

Change-Id: Ia7a788a28e6c0fd9cb52fb7ea477cddd7d589e58

4 files changed, 58 insertions, 33 deletions

diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py
index 551e63b..058737f 100644
--- a/tests/unit/rpc/test_zmq.py
+++ b/tests/unit/rpc/test_zmq.py
@@ -107,7 +107,7 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase):
             self.reactor.consume_in_thread()
         except zmq.ZMQError:
             LOG.error(_("Could not create ZeroMQ receiver daemon. "
-                            "Socket may already be in use."))
+                        "Socket may already be in use."))
             raise
 
     def tearDown(self):
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index 9c86f8d..b64fe8c 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -265,7 +265,7 @@ class FancyRecordTestCase(test_utils.BaseTestCase):
 
         self.colorlog.info("foo")
         self.assertNotEqual(sys.stderr.getvalue().find("KeyError: 'missing'"),
-                           -1)
+                            -1)
 
         sys.stderr = error
 
diff --git a/tests/unit/test_notifier.py b/tests/unit/test_notifier.py
index e5c69b4..1cabae0 100644
--- a/tests/unit/test_notifier.py
+++ b/tests/unit/test_notifier.py
@@ -32,8 +32,10 @@ class NotifierTestCase(test_utils.BaseTestCase):
     """Test case for notifications"""
     def setUp(self):
         super(NotifierTestCase, self).setUp()
-        self.config(notification_driver=['openstack.common.'
-                                        'notifier.no_op_notifier'])
+        notification_driver = [
+            'openstack.common.notifier.no_op_notifier'
+        ]
+        self.config(notification_driver=notification_driver)
         self.config(default_publisher_id='publisher')
 
     def tearDown(self):
@@ -234,40 +236,60 @@ class MultiNotifierTestCase(test_utils.BaseTestCase):
         super(MultiNotifierTestCase, self).tearDown()
 
     def test_send_notifications_successfully(self):
-        self.config(notification_driver=[
-                       'openstack.common.notifier.no_op_notifier'])
-        notifier_api.notify('contextarg', 'publisher_id', 'event_type',
-                notifier_api.WARN, dict(a=3))
+        notification_driver = [
+            'openstack.common.notifier.no_op_notifier'
+        ]
+        self.config(notification_driver=notification_driver)
+        notifier_api.notify('contextarg',
+                            'publisher_id',
+                            'event_type',
+                            notifier_api.WARN,
+                            dict(a=3))
         self.assertEqual(self.notify_count, 1)
         self.assertEqual(self.exception_count, 0)
 
     def test_send_notifications_with_errors(self):
-        self.config(notification_driver=[
-                       'openstack.common.notifier.no_op_notifier',
-                       'openstack.common.notifier.log_notifier'])
-        notifier_api.notify('contextarg', 'publisher_id',
-                'event_type', notifier_api.WARN, dict(a=3))
+        notification_driver = [
+            'openstack.common.notifier.no_op_notifier',
+            'openstack.common.notifier.log_notifier'
+        ]
+        self.config(notification_driver=notification_driver)
+        notifier_api.notify('contextarg',
+                            'publisher_id',
+                            'event_type',
+                            notifier_api.WARN,
+                            dict(a=3))
         self.assertEqual(self.notify_count, 1)
         self.assertEqual(self.exception_count, 1)
 
     def test_when_driver_fails_to_import(self):
-        self.config(notification_driver=[
-                       'openstack.common.notifier.no_op_notifier',
-                       'openstack.common.notifier.logo_notifier',
-                       'fdsjgsdfhjkhgsfkj'])
-        notifier_api.notify('contextarg', 'publisher_id',
-                'event_type', notifier_api.WARN, dict(a=3))
+        notification_driver = [
+            'openstack.common.notifier.no_op_notifier',
+            'openstack.common.notifier.logo_notifier',
+            'fdsjgsdfhjkhgsfkj'
+        ]
+        self.config(notification_driver=notification_driver)
+        notifier_api.notify('contextarg',
+                            'publisher_id',
+                            'event_type',
+                            notifier_api.WARN,
+                            dict(a=3))
         self.assertEqual(self.exception_count, 2)
         self.assertEqual(self.notify_count, 1)
 
     def test_adding_and_removing_notifier_object(self):
         self.notifier_object = SimpleNotifier()
-        self.config(notification_driver=[
-                       'openstack.common.notifier.no_op_notifier'])
+        notification_driver = [
+            'openstack.common.notifier.no_op_notifier'
+        ]
+        self.config(notification_driver=notification_driver)
 
         notifier_api.add_driver(self.notifier_object)
-        notifier_api.notify(None, 'publisher_id', 'event_type',
-                notifier_api.WARN, dict(a=3))
+        notifier_api.notify(None,
+                            'publisher_id',
+                            'event_type',
+                            notifier_api.WARN,
+                            dict(a=3))
         self.assertEqual(self.notify_count, 1)
         self.assertTrue(self.notifier_object.notified)
 
@@ -277,6 +299,9 @@ class MultiNotifierTestCase(test_utils.BaseTestCase):
         self.config(notification_driver=[])
 
         notifier_api.add_driver('openstack.common.notifier.no_op_notifier')
-        notifier_api.notify(None, 'publisher_id', 'event_type',
-                notifier_api.WARN, dict(a=3))
+        notifier_api.notify(None,
+                            'publisher_id',
+                            'event_type',
+                            notifier_api.WARN,
+                            dict(a=3))
         self.assertEqual(self.notify_count, 1)
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 25280f9..7dadf72 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -83,17 +83,17 @@ class UtilsTest(unittest.TestCase):
 
     def test_parse_host_port(self):
         self.assertEqual(('server01', 80),
-            utils.parse_host_port('server01:80'))
+                         utils.parse_host_port('server01:80'))
         self.assertEqual(('server01', None),
-            utils.parse_host_port('server01'))
+                         utils.parse_host_port('server01'))
         self.assertEqual(('server01', 1234),
-            utils.parse_host_port('server01', default_port=1234))
+                         utils.parse_host_port('server01', default_port=1234))
         self.assertEqual(('::1', 80),
-            utils.parse_host_port('[::1]:80'))
+                         utils.parse_host_port('[::1]:80'))
         self.assertEqual(('::1', None),
-            utils.parse_host_port('[::1]'))
+                         utils.parse_host_port('[::1]'))
         self.assertEqual(('::1', 1234),
-            utils.parse_host_port('[::1]', default_port=1234))
+                         utils.parse_host_port('[::1]', default_port=1234))
         self.assertEqual(('2001:db8:85a3::8a2e:370:7334', 1234),
-            utils.parse_host_port('2001:db8:85a3::8a2e:370:7334',
-              default_port=1234))
+                         utils.parse_host_port('2001:db8:85a3::8a2e:370:7334',
+                                               default_port=1234))