Merge remote-tracking branch 'origin/master'

KnowledgeSeed · Jun 25, 2024 · bc55d3e · bc55d3e
2 parents f4bc59b + 5c2c339
commit bc55d3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -54,14 +54,8 @@ jobs:
       run: |
         cd tests_integration
         echo "Running tests..."
-        DOCKID=$(docker ps -q --filter "name=tests_integration-airflow-worker-1")
-        docker exec -i $DOCKID /bin/bash <<-EOF
-          airflow dags test airflow_test_success_dag > logs/integration_test_airflow_test_success_dag.log
-          airflow dags test airflow_test_aborted_dag >> logs/integration_test_airflow_test_aborted_dag.log
-          airflow dags test airflow_test_data_error_dag >> logs/integration_test_airflow_test_data_error_dag.log
-          airflow dags test airflow_test_timeout_dag >> logs/integration_test_airflow_test_timeout_dag.log
-          exit 0
-        EOF
+        pip install pytest
+        pytest integration_test.py -s
 
     - name: Archive production artifacts
       if: always()

diff --git a/tests_integration/dags/airflow_test_timeout_dag.py b/tests_integration/dags/airflow_test_timeout_dag.py
@@ -40,7 +40,7 @@
         task_id='t1',
         tm1_conn_id='tm1_conn',
         process_name='airflow_test_timeout',
-        timeout=20,
+        timeout=3,
         cancel_at_timeout=True
     )