Fix notes tests and minor API fixes (#213)

Author: satterly

Makefile

@@ -68,10 +68,16 @@ lint: $(PYLINT) $(MYPY) $(BLACK)
 hooks: $(PRE_COMMIT)
 	$(PRE_COMMIT) run -a
 
-## test			- Run unit tests.
-test: $(TOX) $(PYTEST)
+## test.unit		- Run unit tests.
+test.unit: $(TOX) $(PYTEST)
 	$(TOX) $(toxparams)
 
+## test.integration	- Run integration tests.
+test.integration: $(TOX) $(PYTEST)
+	docker-compose -f docker-compose.ci.yaml build sut
+	docker-compose -f docker-compose.ci.yaml up --exit-code-from sut
+	docker-compose -f docker-compose.ci.yaml rm --stop --force
+
 ## run			- Run application.
 run:
 	alertad

alertaclient/api.py

@@ -144,9 +144,9 @@ def get_tags(self, query=None):
         r = self.http.get('/alerts/tags', query)
         return r['tags']
 
-    def alert_note(self, id, note):
+    def alert_note(self, id, text):
         data = {
-            'note': note
+            'text': text
         }
         return self.http.put('/alert/%s/note' % id, data)
 

alertaclient/commands/cmd_note.py

@@ -29,4 +29,4 @@ def cli(obj, ids, alert_ids, query, filters, text, delete):
 
         with click.progressbar(alert_ids, label='Add note to {} alerts'.format(total)) as bar:
             for id in bar:
-                client.alert_note(id, note=text)
+                client.alert_note(id, text=text)

docker-compose.ci.yaml

@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
     environment:
-      - DEBUG=1  # remove this line to turn DEBUG off
+#      - DEBUG=1  # remove this line to turn DEBUG off
       - DATABASE_URL=postgres://postgres:postgres@db:5432/monitoring
       - AUTH_REQUIRED=True
       - ADMIN_USERS=admin@alerta.io,devops@alerta.io #default password: alerta
@@ -21,6 +21,8 @@ services:
 
   db:
     image: postgres:9.6
+    volumes:
+      - /var/lib/postgresql/data
     environment:
       - POSTGRES_DB=monitoring
       - POSTGRES_USER=postgres

tests/integration/test_sdk.py

@@ -58,9 +58,13 @@ def test_key(self):
         self.assertEqual(api_key.user, 'johndoe@example.com')
         self.assertEqual(sorted(api_key.scopes), sorted(['write:alerts', 'admin:keys']))
 
-    # def test_note(self):
-    #     n = self.client.alert_note(id='e7020428-5dad-4a41-9bfe-78e9d55cda06', note='this is a test note')
-    #     self.assertEqual(n.text, 'this is a test note')
+    def test_note(self):
+        id, alert, message = self.client.send_alert(
+            environment='Production', resource='web02', event='node_down', correlated=['node_up', 'node_down'],
+            service=['Web', 'App'], severity='critical', tags=['london', 'linux'], value=4
+        )
+        n = self.client.alert_note(id, text='this is a test note')
+        self.assertEqual(n.text, 'this is a test note')
 
     def test_permission(self):
         perm = self.client.create_perm(role='websys', scopes=['admin:users', 'admin:keys', 'write'])

tests/unit/test_notes.py

@@ -19,5 +19,5 @@ def setUp(self):
     @requests_mock.mock()
     def test_add_note(self, m):
         m.put('http://localhost:8080/alert/e7020428-5dad-4a41-9bfe-78e9d55cda06/note', text=self.note)
-        r = self.client.alert_note(id='e7020428-5dad-4a41-9bfe-78e9d55cda06', note='this is a test note')
+        r = self.client.alert_note(id='e7020428-5dad-4a41-9bfe-78e9d55cda06', text='this is a test note')
         self.assertEqual(r['status'], 'ok')