update-channels smoke tests with django channels

Author: mmcardle

.github/workflows/ci.yml

@@ -82,24 +82,6 @@ jobs:
       - run: yarn test_core
 
   cli_tests:
-    name: DB.io - CLI Tests
-    needs: [build]
-    runs-on: ubuntu-24.04
-    steps:
-      - run: sudo apt-get install -y libsqlite3-dev
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          # Install a specific version of uv.
-          version: "0.5.6"
-      - run: yarn
-      - run: make smoke_test
-
-  cli_tests_postgres:
     name: DB.io - CLI Tests for Postgres
     needs: [build]
     runs-on: ubuntu-24.04
@@ -133,7 +115,7 @@ jobs:
           version: "0.5.6"
       - run: yarn
       - name: Run Smoke tests with Postgres
-        run: make smoke_test_postgres_ci
+        run: make smoke_test_ci
         env:
           POSTGRES_URL: postgres://postgres:mysecretpassword@localhost:5432/postgres
 

Makefile

@@ -24,18 +24,13 @@ else
 endif
 
 smoke_test:
-	./script/cli_test.sh ${EXAMPLE_PROJECT_JSON}
-
-smoke_test_postgres:
-	./script/cli_test.sh ${EXAMPLE_PROJECT_POSTGRES_JSON} start_docker
+	jq -s '.[0] * .[1]' ${EXAMPLE_PROJECT_POSTGRES_JSON} ${PARTIAL_WITH_CHANNELS_JSON} > /tmp/project-with-channels.json
+	./script/cli_test.sh /tmp/project-with-channels.json start_docker
 
-smoke_test_postgres_channels:
+smoke_test_ci:
 	jq -s '.[0] * .[1]' ${EXAMPLE_PROJECT_POSTGRES_JSON} ${PARTIAL_WITH_CHANNELS_JSON} > /tmp/project-with-channels.json
 	./script/cli_test.sh /tmp/project-with-channels.json
 
-smoke_test_postgres_ci:
-	./script/cli_test.sh ${EXAMPLE_PROJECT_POSTGRES_JSON}
-
 create:
 	yarn run cli ${EXAMPLE_PROJECT_POSTGRES_JSON} ${EXAMPLE_TAR_OUTPUT}
 	echo "Project created at ${PROJECT_NAME}"

script/cli_test.sh

@@ -75,15 +75,15 @@ curl --connect-timeout 5 \
     "http://127.0.0.1:${DJANGO_PORT}" || kill ${ID}
 
 curl "http://127.0.0.1:${DJANGO_PORT}" | grep "DjangoModel1 Listing"
-RESULT=$?
+HTTP_RESULT=$?
 
 echo "Test Message" | websocat ws://127.0.0.1:${DJANGO_PORT}/ws/ -1 | grep "Hello from DjangoProjectWithChannels WebSocketConsumer! Test Message"
-RESULT_WEBSOCKET=$?
+WEBSOCKET_RESULT=$?
 
 echo -e "View Results at \e[32m${DIR}/${PROJECT_NAME}\e[0m"
 
 kill ${ID}
-if [ $RESULT -eq 0 ] && [ $RESULT_WEBSOCKET -eq 0 ]; then
+if [ $HTTP_RESULT -eq 0 ] && [ $WEBSOCKET_RESULT -eq 0 ]; then
     echo -e "\e[32mTest passed\e[0m"
     exit 0
 else