Fix E128 issues and enable E128

This commit fixes the issues reported by pep8 as
violation of E128, and enables E128 in tox.ini

Change-Id: If88653c3dbadffa63b5ba7c561f69ce893d670ac

ironic_lib/disk_utils.py

@@ -211,8 +211,9 @@ def is_block_device(dev):
             s = os.stat(dev)
         except OSError as e:
             LOG.debug("Unable to stat device %(dev)s. Attempt %(attempt)d "
-                      "out of %(total)d. Error: %(err)s", {"dev": dev,
-                      "attempt": attempt + 1, "total": attempts, "err": e})
+                      "out of %(total)d. Error: %(err)s",
+                      {"dev": dev, "attempt": attempt + 1,
+                       "total": attempts, "err": e})
             time.sleep(1)
         else:
             return stat.S_ISBLK(s.st_mode)

tests/ironic_lib/test_disk_partitioner.py

@@ -71,8 +71,8 @@ class DiskPartitionerTestCase(test_base.BaseTestCase):
             'mkpart', 'fake-type', 'fake-fs-type', '1', '2',
             'mkpart', 'fake-type', 'fake-fs-type', '2', '3',
             'set', '2', 'boot', 'on')
-        mock_utils_exc.assert_called_once_with('fuser', '/dev/fake',
-            run_as_root=True, check_exit_code=[0, 1])
+        mock_utils_exc.assert_called_once_with(
+            'fuser', '/dev/fake', run_as_root=True, check_exit_code=[0, 1])
 
     @mock.patch.object(disk_partitioner.DiskPartitioner, '_exec',
                        autospec=True)
@@ -100,8 +100,8 @@ class DiskPartitionerTestCase(test_base.BaseTestCase):
             'mkpart', 'fake-type', 'fake-fs-type', '1', '2',
             'mkpart', 'fake-type', 'fake-fs-type', '2', '3',
             'set', '2', 'boot', 'on')
-        mock_utils_exc.assert_called_with('fuser', '/dev/fake',
-            run_as_root=True, check_exit_code=[0, 1])
+        mock_utils_exc.assert_called_with(
+            'fuser', '/dev/fake', run_as_root=True, check_exit_code=[0, 1])
         self.assertEqual(2, mock_utils_exc.call_count)
 
     @mock.patch.object(disk_partitioner.DiskPartitioner, '_exec',
@@ -129,8 +129,8 @@ class DiskPartitionerTestCase(test_base.BaseTestCase):
             'mkpart', 'fake-type', 'fake-fs-type', '1', '2',
             'mkpart', 'fake-type', 'fake-fs-type', '2', '3',
             'set', '2', 'boot', 'on')
-        mock_utils_exc.assert_called_with('fuser', '/dev/fake',
-            run_as_root=True, check_exit_code=[0, 1])
+        mock_utils_exc.assert_called_with(
+            'fuser', '/dev/fake', run_as_root=True, check_exit_code=[0, 1])
         self.assertEqual(20, mock_utils_exc.call_count)
 
     @mock.patch.object(disk_partitioner.DiskPartitioner, '_exec',
@@ -159,6 +159,6 @@ class DiskPartitionerTestCase(test_base.BaseTestCase):
             'mkpart', 'fake-type', 'fake-fs-type', '1', '2',
             'mkpart', 'fake-type', 'fake-fs-type', '2', '3',
             'set', '2', 'boot', 'on')
-        mock_utils_exc.assert_called_with('fuser', '/dev/fake',
-            run_as_root=True, check_exit_code=[0, 1])
+        mock_utils_exc.assert_called_with(
+            'fuser', '/dev/fake', run_as_root=True, check_exit_code=[0, 1])
         self.assertEqual(20, mock_utils_exc.call_count)

tests/ironic_lib/test_disk_utils.py

@@ -255,8 +255,9 @@ class MakePartitionsTestCase(test_base.BaseTestCase):
                            'root': 'fake-dev3'}
         cmd = self._get_parted_cmd(self.dev) + expected_mkpart
         mock_exc.return_value = (None, None)
-        result = disk_utils.make_partitions(self.dev, self.root_mb,
-                    self.swap_mb, self.ephemeral_mb, self.configdrive_mb)
+        result = disk_utils.make_partitions(
+            self.dev, self.root_mb, self.swap_mb, self.ephemeral_mb,
+            self.configdrive_mb)
 
         parted_call = mock.call(*cmd, run_as_root=True, check_exit_code=[0])
         mock_exc.assert_has_calls([parted_call])
@@ -273,8 +274,9 @@ class MakePartitionsTestCase(test_base.BaseTestCase):
                            'root': self.dev + '-part3'}
         cmd = self._get_parted_cmd(self.dev) + expected_mkpart
         mock_exc.return_value = (None, None)
-        result = disk_utils.make_partitions(self.dev, self.root_mb,
-                     self.swap_mb, self.ephemeral_mb, self.configdrive_mb)
+        result = disk_utils.make_partitions(
+            self.dev, self.root_mb, self.swap_mb, self.ephemeral_mb,
+            self.configdrive_mb)
 
         parted_call = mock.call(*cmd, run_as_root=True, check_exit_code=[0])
         mock_exc.assert_has_calls([parted_call])
@@ -294,9 +296,9 @@ class MakePartitionsTestCase(test_base.BaseTestCase):
                            'root': self.dev + '-part4'}
         cmd = self._get_parted_cmd_uefi(self.dev) + expected_mkpart
         mock_exc.return_value = (None, None)
-        result = disk_utils.make_partitions(self.dev, self.root_mb,
-                     self.swap_mb, self.ephemeral_mb, self.configdrive_mb,
-                     boot_option='local', boot_mode='uefi')
+        result = disk_utils.make_partitions(
+            self.dev, self.root_mb, self.swap_mb, self.ephemeral_mb,
+            self.configdrive_mb, boot_option='local', boot_mode='uefi')
 
         parted_call = mock.call(*cmd, run_as_root=True, check_exit_code=[0])
         mock_exc.assert_has_calls([parted_call])

tox.ini

@@ -10,7 +10,7 @@ commands =
 
 [flake8]
 show-source = True
-ignore = E128,E129
+ignore = E129
 exclude = .venv,.tox,dist,doc,*.egg,.update-venv
 
 [testenv:pep8]