Fix integration tests

Author: satterly

docker-compose.ci.yaml

@@ -1,8 +1,8 @@
 version: '3.7'
 
 services:
-  api:
-    image: ghcr.io/alerta/alerta-api:latest
+  alerta:
+    image: alerta/alerta-web
     ports:
       - "8080:8080"
     depends_on:
@@ -14,34 +14,17 @@ services:
       - ADMIN_USERS=admin@alerta.io,devops@alerta.io #default password: alerta
       - ADMIN_KEY=demo-key  # assigned to first user in ADMIN_USERS list
       # - PLUGINS=reject,blackout,normalise,enhance
-    networks:
-      net:
-        aliases:
-          - api
 
   db:
-    image: postgres:9.6
-    volumes:
-      - /var/lib/postgresql/data
+    image: postgres:14
     environment:
       - POSTGRES_DB=monitoring
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     restart: always
-    networks:
-      net:
-        aliases:
-          - db
 
   sut:
     build: .
     depends_on:
-      - api
-    command: ["./wait-for-it.sh", "api:8080", "-t", "60", "--", "pytest", "tests/integration/"]
-    networks:
-      net:
-        aliases:
-          - sut
-
-networks:
-  net: {}
+      - alerta
+    command: ["./wait-for-it.sh", "alerta:8080", "-t", "60", "--", "pytest", "tests/integration/"]

tests/integration/test_alerts.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_alert(self):
         id, alert, message = self.client.send_alert(

tests/integration/test_blackouts.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_blackout(self):
         blackout = self.client.create_blackout(

tests/integration/test_customers.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_customer(self):
         customer = self.client.create_customer(customer='ACME Corp.', match='example.com')

tests/integration/test_groups.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_group(self):
         group = self.client.create_group(name='myGroup', text='test group')

tests/integration/test_heartbeats.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_heartbeat(self):
         hb = self.client.heartbeat(origin='app/web01', timeout=10, tags=['london', 'linux'])

tests/integration/test_history.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_alert(self):
         id, alert, message = self.client.send_alert(

tests/integration/test_keys.py

@@ -7,7 +7,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_key(self):
         api_key = self.client.create_key(

tests/integration/test_notes.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_notes(self):
         # add tests here when /notes endpoints are created

tests/integration/test_permissions.py

@@ -6,7 +6,7 @@
 class AlertTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.client = Client(endpoint='http://api:8080', key='demo-key')
+        self.client = Client(endpoint='http://alerta:8080/api', key='demo-key')
 
     def test_permission(self):
         perm = self.client.create_perm(role='websys', scopes=['admin:users', 'admin:keys', 'write'])