Blacken openstackclient.volume

Black used with the '-l 79 -S' flags.

A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.

Change-Id: Ic318617c67ab7ce6527f9016b759a1d4b0b80802
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

Author: stephenfin

openstackclient/tests/functional/volume/base.py

@@ -16,11 +16,18 @@
 
 
 class BaseVolumeTests(base.TestCase):
-    """Base class for Volume functional tests. """
+    """Base class for Volume functional tests."""
 
     @classmethod
-    def wait_for_status(cls, check_type, check_name, desired_status,
-                        wait=120, interval=5, failures=None):
+    def wait_for_status(
+        cls,
+        check_type,
+        check_name,
+        desired_status,
+        wait=120,
+        interval=5,
+        failures=None,
+    ):
         current_status = "notset"
         if failures is None:
             failures = ['error']
@@ -32,23 +39,31 @@ def wait_for_status(cls, check_type, check_name, desired_status,
             )
             current_status = output['status']
             if current_status == desired_status:
-                print('{} {} now has status {}'
-                      .format(check_type, check_name, current_status))
+                print(
+                    '{} {} now has status {}'.format(
+                        check_type, check_name, current_status
+                    )
+                )
                 return
-            print('Checking {} {} Waiting for {} current status: {}'
-                  .format(check_type, check_name,
-                          desired_status, current_status))
+            print(
+                'Checking {} {} Waiting for {} current status: {}'.format(
+                    check_type, check_name, desired_status, current_status
+                )
+            )
             if current_status in failures:
                 raise Exception(
-                    'Current status {} of {} {} is one of failures {}'
-                    .format(current_status, check_type, check_name, failures))
+                    'Current status {} of {} {} is one of failures {}'.format(
+                        current_status, check_type, check_name, failures
+                    )
+                )
             time.sleep(interval)
             total_sleep += interval
         cls.assertOutput(desired_status, current_status)
 
     @classmethod
-    def wait_for_delete(cls, check_type, check_name, wait=120, interval=5,
-                        name_field=None):
+    def wait_for_delete(
+        cls, check_type, check_name, wait=120, interval=5, name_field=None
+    ):
         total_sleep = 0
         name_field = name_field or 'Name'
         while total_sleep < wait:
@@ -57,9 +72,15 @@ def wait_for_delete(cls, check_type, check_name, wait=120, interval=5,
             if check_name not in names:
                 print('{} {} is now deleted'.format(check_type, check_name))
                 return
-            print('Checking {} {} Waiting for deleted'
-                  .format(check_type, check_name))
+            print(
+                'Checking {} {} Waiting for deleted'.format(
+                    check_type, check_name
+                )
+            )
             time.sleep(interval)
             total_sleep += interval
-        raise Exception('Timeout: {} {} was not deleted in {} seconds'
-                        .format(check_type, check_name, wait))
+        raise Exception(
+            'Timeout: {} {} was not deleted in {} seconds'.format(
+                check_type, check_name, wait
+            )
+        )

openstackclient/tests/functional/volume/v1/test_qos.py

@@ -16,31 +16,23 @@
 
 
 class QosTests(common.BaseVolumeTests):
-    """Functional tests for volume qos. """
+    """Functional tests for volume qos."""
 
     def test_volume_qos_create_list(self):
         """Test create, list, delete multiple"""
         name1 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume qos create ' +
-            name1,
+            'volume qos create ' + name1,
             parse_output=True,
         )
-        self.assertEqual(
-            name1,
-            cmd_output['name']
-        )
+        self.assertEqual(name1, cmd_output['name'])
 
         name2 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume qos create ' +
-            name2,
+            'volume qos create ' + name2,
             parse_output=True,
         )
-        self.assertEqual(
-            name2,
-            cmd_output['name']
-        )
+        self.assertEqual(name2, cmd_output['name'])
 
         # Test list
         cmd_output = self.openstack(
@@ -60,67 +52,43 @@ def test_volume_qos_set_show_unset(self):
 
         name = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume qos create ' +
-            '--consumer front-end '
-            '--property Alpha=a ' +
-            name,
+            'volume qos create ' + '--consumer front-end '
+            '--property Alpha=a ' + name,
             parse_output=True,
         )
         self.addCleanup(self.openstack, 'volume qos delete ' + name)
-        self.assertEqual(
-            name,
-            cmd_output['name']
-        )
+        self.assertEqual(name, cmd_output['name'])
 
-        self.assertEqual(
-            "front-end",
-            cmd_output['consumer']
-        )
+        self.assertEqual("front-end", cmd_output['consumer'])
 
         # Test volume qos set
         raw_output = self.openstack(
-            'volume qos set ' +
-            '--property Alpha=c ' +
-            '--property Beta=b ' +
-            name,
+            'volume qos set '
+            + '--property Alpha=c '
+            + '--property Beta=b '
+            + name,
         )
         self.assertOutput('', raw_output)
 
         # Test volume qos show
         cmd_output = self.openstack(
-            'volume qos show ' +
-            name,
+            'volume qos show ' + name,
             parse_output=True,
         )
-        self.assertEqual(
-            name,
-            cmd_output['name']
-        )
-        self.assertEqual(
-            {'Alpha': 'c', 'Beta': 'b'},
-            cmd_output['properties']
-        )
+        self.assertEqual(name, cmd_output['name'])
+        self.assertEqual({'Alpha': 'c', 'Beta': 'b'}, cmd_output['properties'])
 
         # Test volume qos unset
         raw_output = self.openstack(
-            'volume qos unset ' +
-            '--property Alpha ' +
-            name,
+            'volume qos unset ' + '--property Alpha ' + name,
         )
         self.assertOutput('', raw_output)
 
         cmd_output = self.openstack(
-            'volume qos show ' +
-            name,
+            'volume qos show ' + name,
             parse_output=True,
         )
-        self.assertEqual(
-            name,
-            cmd_output['name']
-        )
-        self.assertEqual(
-            {'Beta': 'b'},
-            cmd_output['properties']
-        )
+        self.assertEqual(name, cmd_output['name'])
+        self.assertEqual({'Beta': 'b'}, cmd_output['properties'])
 
     # TODO(qiangjiahui): Add tests for associate and disassociate volume type

openstackclient/tests/functional/volume/v1/test_service.py

@@ -24,22 +24,16 @@ def test_volume_service_list(self):
 
         # Test volume service list --service
         cmd_output = self.openstack(
-            'volume service list ' +
-            '--service ' +
-            services[0],
+            'volume service list ' + '--service ' + services[0],
             parse_output=True,
         )
         for x in cmd_output:
-            self.assertEqual(
-                services[0],
-                x['Binary']
-            )
+            self.assertEqual(services[0], x['Binary'])
 
         # TODO(zhiyong.dai): test volume service list --host after solving
         # https://bugs.launchpad.net/python-openstackclient/+bug/1664451
 
     def test_volume_service_set(self):
-
         # Get a service and host
         cmd_output = self.openstack(
             'volume service list',
@@ -50,42 +44,33 @@ def test_volume_service_set(self):
 
         # Test volume service set --enable
         raw_output = self.openstack(
-            'volume service set --enable ' +
-            host_1 + ' ' +
-            service_1
+            'volume service set --enable ' + host_1 + ' ' + service_1
         )
         self.assertOutput('', raw_output)
 
         cmd_output = self.openstack(
             'volume service list --long',
             parse_output=True,
         )
-        self.assertEqual(
-            'enabled',
-            cmd_output[0]['Status']
-        )
+        self.assertEqual('enabled', cmd_output[0]['Status'])
         self.assertIsNone(cmd_output[0]['Disabled Reason'])
 
         # Test volume service set --disable and --disable-reason
         disable_reason = 'disable_reason'
         raw_output = self.openstack(
-            'volume service set --disable ' +
-            '--disable-reason ' +
-            disable_reason + ' ' +
-            host_1 + ' ' +
-            service_1
+            'volume service set --disable '
+            + '--disable-reason '
+            + disable_reason
+            + ' '
+            + host_1
+            + ' '
+            + service_1
         )
         self.assertOutput('', raw_output)
 
         cmd_output = self.openstack(
             'volume service list --long',
             parse_output=True,
         )
-        self.assertEqual(
-            'disabled',
-            cmd_output[0]['Status']
-        )
-        self.assertEqual(
-            disable_reason,
-            cmd_output[0]['Disabled Reason']
-        )
+        self.assertEqual('disabled', cmd_output[0]['Status'])
+        self.assertEqual(disable_reason, cmd_output[0]['Disabled Reason'])