Fix integration tests (#216)

* Fix unit and integration tests

* Fix GitHub Docker Repo auth failure

Author: satterly

.travis.yml

@@ -39,10 +39,10 @@ jobs:
     - stage: Integration
       name: Integration Test
       script:
+      - echo "$GITHUB_TOKEN" | docker login docker.pkg.github.com -u "$DOCKER_USERNAME" --password-stdin
       - 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
 
-
 after_success:
   - coveralls

Dockerfile

@@ -1,17 +1,16 @@
-FROM python:3.7
-RUN apt-get update
+FROM python:3.8-alpine
 
-RUN apt-get install -y \
-    build-essential \
-    python3-dev \
+RUN apk add --no-cache \
+    bash \
+    build-base \
     libffi-dev \
-    libssl-dev
+    openssl-dev \
+    postgresql-dev \
+    python3-dev
 
-WORKDIR /usr/src/app
+COPY . /app
+WORKDIR /app
 
-COPY requirements*.txt ./
-RUN pip install --no-cache-dir \
-    -r requirements.txt \
-    -r requirements-dev.txt
-
-COPY . .
+RUN pip install -r requirements.txt
+RUN pip install -r requirements-dev.txt
+RUN pip install .

Makefile

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

alertaclient/api.py

@@ -148,17 +148,19 @@ def alert_note(self, id, text):
         data = {
             'text': text
         }
-        return self.http.put('/alert/%s/note' % id, data)
+        r = self.http.put('/alert/{}/note'.format(id), data)
+        return Note.parse(r['note'])
 
     def get_alert_notes(self, id, page=1, page_size=None):
         r = self.http.get('/alert/{}/notes'.format(id), page=page, page_size=page_size)
-        return [Note.parse(b) for b in r['notes']]
+        return [Note.parse(n) for n in r['notes']]
 
     def update_alert_note(self, id, note_id, text):
         data = {
             'text': text,
         }
-        self.http.put('/alert/{}/note/{}'.format(id, note_id), data)
+        r = self.http.put('/alert/{}/note/{}'.format(id, note_id), data)
+        return Note.parse(r['note'])
 
     def delete_alert_note(self, id, note_id):
         return self.http.delete('/alert/{}/note/{}'.format(id, note_id))

docker-compose.ci.yaml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   api:
-    image: alerta/alerta-web  # use API in "alerta-web" image
+    image: docker.pkg.github.com/alerta/alerta/alerta-api:latest
     ports:
       - "8080:8080"
     depends_on:

tests/integration/test_sdk.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080/api', key='demo-key')
+        self.client = Client(endpoint='http://api:8080', key='demo-key')
 
     def test_alert(self):
         id, alert, message = self.client.send_alert(
@@ -63,8 +63,20 @@ def test_note(self):
             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')
+        note = self.client.alert_note(id, text='this is a test note')
+        self.assertEqual(note.text, 'this is a test note')
+
+        notes = self.client.get_alert_notes(id)
+        self.assertEqual(notes[0].text, 'this is a test note')
+        self.assertEqual(notes[0].user, 'admin@alerta.io')
+
+        note = self.client.update_alert_note(id, notes[0].id, text='updated note text')
+        self.assertEqual(note.text, 'updated note text')
+
+        self.client.delete_alert_note(id, notes[0].id)
+
+        notes = self.client.get_alert_notes(id)
+        self.assertEqual(notes, [])
 
     def test_permission(self):
         perm = self.client.create_perm(role='websys', scopes=['admin:users', 'admin:keys', 'write'])

tests/unit/test_notes.py

@@ -40,6 +40,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', text='this is a new note')
-        self.assertEqual(r['status'], 'ok')
-        self.assertEqual(r['note']['text'], 'this is a new note')
+        note = self.client.alert_note(id='e7020428-5dad-4a41-9bfe-78e9d55cda06', text='this is a new note')
+        self.assertEqual(note.text, 'this is a new note')