xconnio
diff --git a/‎.github/workflows/main.yaml‎
Lines changed: 15 additions & 9 deletions b/‎.github/workflows/main.yaml‎
Lines changed: 15 additions & 9 deletions
diff --git a/‎Makefile‎
Lines changed: 4 additions & 1 deletion b/‎Makefile‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎tests/aat/__init__.py‎ b/‎tests/aat/__init__.py‎
diff --git a/‎tests/client_test.py‎ ‎tests/aat/client_test.py‎tests/client_test.py renamed to tests/aat/client_test.py b/‎tests/client_test.py‎ ‎tests/aat/client_test.py‎tests/client_test.py renamed to tests/aat/client_test.py
diff --git a/‎tests/interop_test.py‎ ‎tests/aat/interop_test.py‎tests/interop_test.py renamed to tests/aat/interop_test.py b/‎tests/interop_test.py‎ ‎tests/aat/interop_test.py‎tests/interop_test.py renamed to tests/aat/interop_test.py
diff --git a/‎tests/unit/__init__.py‎ b/‎tests/unit/__init__.py‎
diff --git a/‎tests/acceptor_test.py‎ ‎tests/unit/acceptor_test.py‎tests/acceptor_test.py renamed to tests/unit/acceptor_test.py b/‎tests/acceptor_test.py‎ ‎tests/unit/acceptor_test.py‎tests/acceptor_test.py renamed to tests/unit/acceptor_test.py
diff --git a/‎tests/router_test.py‎ ‎tests/unit/router_test.py‎tests/router_test.py renamed to tests/unit/router_test.py b/‎tests/router_test.py‎ ‎tests/unit/router_test.py‎tests/router_test.py renamed to tests/unit/router_test.py
@@ -22,23 +22,29 @@ jobs:
       - name: Setup environment & install dependencies
         run: make setup
 
-      - name: Setup AAT
-        run: |
-          git clone https://github.com/xconnio/xconn-aat-setup.git
-          cd xconn-aat-setup
-          make up
-          sudo snap install wick --classic
-          timeout 30 bash -c 'until wick --url ws://localhost:8081/ws publish test; do sleep 1; done'
-
-      - name: Run tests
+      - name: Run unit tests
         run: make test
 
+      - name: Install wick
+        run: sudo snap install wick --classic
+
       - name: Run Integration tests
         run: |
           make install-nxt
           nxt start -c tests/ &
+          timeout 30 bash -c 'until wick --url ws://localhost:8079/ws publish test; do sleep 1; done'
           make integration
 
+      - name: Setup AAT
+        run: |
+          git clone https://github.com/xconnio/xconn-aat-setup.git
+          cd xconn-aat-setup
+          make up
+          timeout 30 bash -c 'until wick --url ws://localhost:8081/ws publish test; do sleep 1; done'
+
+      - name: Run AAT tests
+        run: make aat
+
   ruff:
     runs-on: ubuntu-latest
     steps:
 
@@ -17,7 +17,7 @@ lint:
 	./.venv/bin/ruff check .
 
 test:
-	./.venv/bin/pytest -s -v
+	./.venv/bin/pytest -s -v tests/unit
 
 run:
 	./.venv/bin/xconn example:app --directory examples/simple
@@ -47,3 +47,6 @@ install-nxt:
 integration:
 	make install-nxt
 	./.venv/bin/pytest -s -v tests/integration/
+
+aat:
+	./.venv/bin/pytest -s -v tests/aat/