style: fix style and remove duplicate code from rebase/merge

Author: sbgap

alertaclient/api.py

@@ -107,9 +107,6 @@ def update_attributes(self, id, attributes):
 
     def delete_alert(self, id):
         return self.http.delete('/alert/%s' % id)
-    
-    def delete_alerts(self, ids):
-        return self.http.delete('/alerts?%s' % '&'.join([f'id={id}'for id in ids]))
 
     def delete_alerts(self, ids):
         return self.http.delete('/alerts?%s' % '&'.join([f'id={id}'for id in ids]))

alertaclient/commands/cmd_heartbeats.py

@@ -122,8 +122,7 @@ def cli(obj, alert, severity, timeout, purge):
             for b in bar:
                 client.send_alerts(b)
 
-        
-        alerts = [alert.id for alert in alerts]            
+        alerts = [alert.id for alert in alerts]
         number_of_deletes = len(alerts)
         number_of_delete_sends = number_of_deletes // number_of_co
         delete_groups = [alerts[i * number_of_co:(i + 1) * number_of_co] for i in range(number_of_delete_sends)]

tests/unit/test_commands.py

@@ -85,32 +85,32 @@ def test_heartbeat_cmd(self, m):
     def test_heartbeats_cmd(self, m):
 
         heartbeats_response = {
-          "heartbeats": [
-            {
-              "attributes": {
-                "environment": "Infrastructure",
-                "severity": "major",
-                "service": ["Internal"],
-                "group": "Heartbeats",
-                "region": "EU"
-              },
-              "createTime": "2020-03-10T20:25:54.541Z",
-              "customer": None,
-              "href": "http://127.0.0.1/heartbeat/52c202e8-d949-45ed-91e0-cdad4f37de73",
-              "id": "52c202e8-d949-45ed-91e0-cdad4f37de73",
-              "latency": 0,
-              "maxLatency": 2000,
-              "origin": "monitoring-01",
-              "receiveTime": "2020-03-10T20:25:54.541Z",
-              "since": 204,
-              "status": "expired",
-              "tags": [],
-              "timeout": 90,
-              "type": "Heartbeat"
-            }
-          ],
-          "status": "ok",
-          "total": 1
+            'heartbeats': [
+                {
+                    'attributes': {
+                        'environment': 'Infrastructure',
+                        'severity': 'major',
+                        'service': ['Internal'],
+                        'group': 'Heartbeats',
+                        'region': 'EU'
+                    },
+                    'createTime': '2020-03-10T20:25:54.541Z',
+                    'customer': None,
+                    'href': 'http://127.0.0.1/heartbeat/52c202e8-d949-45ed-91e0-cdad4f37de73',
+                    'id': '52c202e8-d949-45ed-91e0-cdad4f37de73',
+                    'latency': 0,
+                    'maxLatency': 2000,
+                    'origin': 'monitoring-01',
+                    'receiveTime': '2020-03-10T20:25:54.541Z',
+                    'since': 204,
+                    'status': 'expired',
+                    'tags': [],
+                    'timeout': 90,
+                    'type': 'Heartbeat'
+                }
+            ],
+            'status': 'ok',
+            'total': 1
         }
 
         heartbeat_alert_response = """
@@ -169,7 +169,7 @@ def test_heartbeats_cmd(self, m):
         }
         """
 
-        empty_alerts_response="""
+        empty_alerts_response = """
         {
           "alerts":[],
           "status": "ok"
@@ -182,7 +182,7 @@ def test_heartbeats_cmd(self, m):
         result = self.runner.invoke(heartbeats_cmd, ['--alert'], obj=self.obj)
         self.assertEqual(result.exit_code, 0, result.exception)
         self.assertIn('monitoring-01', result.output)
-        
+
         data = m.last_request.json()[0]
         self.assertEqual(data['environment'], 'Heartbeats')
         self.assertEqual(data['severity'], 'major')