From 8d0af3fa30f136eee71b170549c8d37ece620001 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Sat, 30 Apr 2016 11:01:55 +0800 Subject: [PATCH] remove unnecessary slashes There are some slashes are used in a wrong way, for example: * concatenate multiple lines of code, which should use () instead * split string by \n, there is a dedicate method splitlines() * escape " in strings, use ' instead Change-Id: I094b89a3d85876db28e64a643de3c114d8aeb79a --- aodhclient/tests/functional/test_alarm.py | 82 ++++++++++----------- aodhclient/tests/unit/test_alarm_history.py | 12 +-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/aodhclient/tests/functional/test_alarm.py b/aodhclient/tests/functional/test_alarm.py index 2a11c53..53f5e78 100644 --- a/aodhclient/tests/functional/test_alarm.py +++ b/aodhclient/tests/functional/test_alarm.py @@ -48,7 +48,7 @@ class AodhClientTest(base.ClientTestBase): "--project-id %s" % PROJECT_ID), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), + result.splitlines(), "Alarm with name='ev_alarm1' exists (HTTP 409)") # UPDATE IGNORE INVALID @@ -116,12 +116,12 @@ class AodhClientTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % ALARM_ID, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % ALARM_ID - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % ALARM_ID, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") @@ -166,7 +166,7 @@ class AodhClientTest(base.ClientTestBase): "--project-id %s" % PROJECT_ID), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), + result.splitlines(), "Alarm with name='alarm_th' exists (HTTP 409)") # CREATE FAIL MISSING PARAM @@ -236,12 +236,12 @@ class AodhClientTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % ALARM_ID, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % ALARM_ID - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % ALARM_ID, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") @@ -253,16 +253,16 @@ class AodhClientTest(base.ClientTestBase): project_id = str(uuid.uuid4()) # CREATE result = self.aodh(u'alarm', - params=(u"create --type composite --name calarm1 " - " --composite-rule '{\"or\":[{\"threshold\"" - ": 0.8,\"meter_name\": \"cpu_util\"," - "\"type\": \"threshold\"},{\"and\": [" - "{\"threshold\": 200, \"meter_name\": " - "\"disk.iops\", \"type\": \"threshold\"}," - "{\"threshold\": 1000,\"meter_name\":" - "\"network.incoming.packets.rate\"," - "\"type\": \"threshold\"}]}]}' " - "--project-id %s" % project_id)) + params=(u'create --type composite --name calarm1 ' + ' --composite-rule \'{"or":[{"threshold"' + ': 0.8,"meter_name": "cpu_util",' + '"type": "threshold"},{"and": [' + '{"threshold": 200, "meter_name": ' + '"disk.iops", "type": "threshold"},' + '{"threshold": 1000,"meter_name":' + '"network.incoming.packets.rate",' + '"type": "threshold"}]}]}\' ' + '--project-id %s' % project_id)) alarm = self.details_multiple(result)[0] alarm_id = alarm['alarm_id'] self.assertEqual('calarm1', alarm['name']) @@ -271,19 +271,19 @@ class AodhClientTest(base.ClientTestBase): # CREATE FAIL result = self.aodh(u'alarm', - params=(u"create --type composite --name calarm1 " - " --composite-rule '{\"or\":[{\"threshold\"" - ": 0.8,\"meter_name\": \"cpu_util\"," - "\"type\": \"threshold\"},{\"and\": [" - "{\"threshold\": 200, \"meter_name\": " - "\"disk.iops\", \"type\": \"threshold\"}," - "{\"threshold\": 1000,\"meter_name\":" - "\"network.incoming.packets.rate\"," - "\"type\": \"threshold\"}]}]}' " - "--project-id %s" % project_id), + params=(u'create --type composite --name calarm1 ' + ' --composite-rule \'{"or":[{"threshold"' + ': 0.8,"meter_name": "cpu_util",' + '"type": "threshold"},{"and": [' + '{"threshold": 200, "meter_name": ' + '"disk.iops", "type": "threshold"},' + '{"threshold": 1000,"meter_name":' + '"network.incoming.packets.rate",' + '"type": "threshold"}]}]}\' ' + '--project-id %s' % project_id), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), "Alarm with name='calarm1' exists (HTTP 409)") + result.splitlines(), "Alarm with name='calarm1' exists (HTTP 409)") # CREATE FAIL MISSING PARAM self.assertRaises(exceptions.CommandFailed, @@ -346,12 +346,12 @@ class AodhClientTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % alarm_id, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % alarm_id - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % alarm_id, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") @@ -410,7 +410,7 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): % (RESOURCE_ID, PROJECT_ID)), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), + result.splitlines(), "Alarm with name='alarm_gn1' exists (HTTP 409)") # CREATE FAIL MISSING PARAM @@ -490,12 +490,12 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % ALARM_ID, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % ALARM_ID - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % ALARM_ID, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") @@ -514,7 +514,7 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): "gnocchi_aggregation_by_resources_threshold " "--name alarm1 --metric cpu --threshold 80 " "--query " - "'{\"=\": {\"server_group\": \"my_group\"}}' " + '\'{"=": {"server_group": "my_group"}}\' ' "--resource-type instance " "--aggregation-method last " "--project-id %s" % PROJECT_ID)) @@ -536,13 +536,13 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): "gnocchi_aggregation_by_resources_threshold " "--name alarm1 --metric cpu --threshold 80 " "--query " - "'{\"=\": {\"server_group\": \"my_group\"}}' " + '\'{"=": {"server_group": "my_group"}}\' ' "--resource-type instance " "--aggregation-method last " "--project-id %s" % PROJECT_ID), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), "Alarm with name='alarm1' exists (HTTP 409)") + result.splitlines(), "Alarm with name='alarm1' exists (HTTP 409)") # CREATE FAIL MISSING PARAM self.assertRaises( @@ -553,7 +553,7 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): "gnocchi_aggregation_by_resources_threshold " "--name alarm1 --metric cpu " "--query " - "'{\"=\": {\"server_group\": \"my_group\"}}' " + '\'{"=": {"server_group": "my_group"}}\' ' "--resource-type instance " "--aggregation-method last " "--project-id %s" % PROJECT_ID)) @@ -599,12 +599,12 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % ALARM_ID, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % ALARM_ID - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % ALARM_ID, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") @@ -651,7 +651,7 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): % (METRIC1, METRIC2, PROJECT_ID)), fail_ok=True, merge_stderr=True) self.assertFirstLineStartsWith( - result.split('\n'), "Alarm with name='alarm1' exists (HTTP 409)") + result.splitlines(), "Alarm with name='alarm1' exists (HTTP 409)") # CREATE FAIL MISSING PARAM self.assertRaises( @@ -710,13 +710,13 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase): result = self.aodh('alarm', params="show %s" % ALARM_ID, fail_ok=True, merge_stderr=True) expected = "Alarm %s not found (HTTP 404)" % ALARM_ID - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # DELETE FAIL result = self.aodh('alarm', params="delete %s" % ALARM_ID, fail_ok=True, merge_stderr=True) - self.assertFirstLineStartsWith(result.split('\n'), expected) + self.assertFirstLineStartsWith(result.splitlines(), expected) # LIST DOES NOT HAVE ALARM result = self.aodh('alarm', params="list") diff --git a/aodhclient/tests/unit/test_alarm_history.py b/aodhclient/tests/unit/test_alarm_history.py index 1252794..646525d 100644 --- a/aodhclient/tests/unit/test_alarm_history.py +++ b/aodhclient/tests/unit/test_alarm_history.py @@ -37,13 +37,13 @@ class AlarmHistoryManagerTest(testtools.TestCase): @mock.patch.object(alarm_history.AlarmHistoryManager, '_post') def test_search(self, mock_ahm): ahm = alarm_history.AlarmHistoryManager(self.client) - q = '{"and": [{"=": {"type": "threshold"}}, ' + \ - '{"=": {"alarm_id": "87bacbcb-a09c-4cb9-86d0-ad410dd8ad98"}}]}' + q = ('{"and": [{"=": {"type": "threshold"}}, ' + '{"=": {"alarm_id": "87bacbcb-a09c-4cb9-86d0-ad410dd8ad98"}}]}') ahm.search(q) - expected_called_data = '{"filter": "{\\"and\\": [{\\"=\\": ' + \ - '{\\"type\\": \\"threshold\\"}}, ' + \ - '{\\"=\\": {\\"alarm_id\\": \\"87bacbcb-' + \ - 'a09c-4cb9-86d0-ad410dd8ad98\\"}}]}"}' + expected_called_data = ('{"filter": "{\\"and\\": [{\\"=\\": ' + '{\\"type\\": \\"threshold\\"}}, ' + '{\\"=\\": {\\"alarm_id\\": \\"87bacbcb-' + 'a09c-4cb9-86d0-ad410dd8ad98\\"}}]}"}') mock_ahm.assert_called_with( 'v2/query/alarms/history', data=expected_called_data,