ci: python: set test execution timeout

abhizer · abhizer · commit 169975d62137 · 2025-02-11T12:51:38.000Z
* 5 min for individual tests
* 1 hour for compiling aggregate tests

Also changes the shebang on the bash scripts to
`/usr/bin/env bash` instead of `/bin/bash` as it doesn't exist
in non Filesystem Hierarchy Standard compliant systems (like NixOS).

Signed-off-by: Abhinav Gyawali &lt;22275402+abhizer@users.noreply.github.com&gt;
diff --git a/Earthfile b/Earthfile
@@ -295,8 +295,8 @@ test-python:
             (./pipeline-manager --bind-address=0.0.0.0 --compiler-working-directory=/working-dir/compiler --runner-working-directory=/working-dir/local-runner --sql-compiler-home=/dbsp/sql-to-dbsp-compiler --dbsp-override-path=/dbsp --db-connection-string=postgresql://postgres:postgres@localhost:5432 --compilation-profile=unoptimized &) && \
             sleep 5 && \
             PYTHONPATH=`pwd` python3 ./tests/aggregate_tests/main.py && \
-            if [ $ALL = "1" ]; then \
-                cd tests && python -m pytest . ; \
+            if [ $all = "1" ]; then \
+                cd tests && python -m pytest . --timeout=300; \
             else \
                 echo "Skipping pytest as --all argument is not set to 1"; \
             fi
diff --git a/python/tests/aggregate_tests/aggtst_base.py b/python/tests/aggregate_tests/aggtst_base.py
@@ -163,7 +163,7 @@ def run_tests(self):
             data = table.get_data()
             pipeline.input_json(table.name, data, update_format="insert_delete")
 
-        pipeline.wait_for_completion(shutdown=False)
+        pipeline.wait_for_completion(shutdown=False, timeout_s=3600)
         for view in self.views:
             view.validate(pipeline)
 
diff --git a/python/tests/requirements.txt b/python/tests/requirements.txt
@@ -1,2 +1,2 @@
 kafka-python-ng==2.2.2
-pytest
+pytest-timeout
diff --git a/python/tests/test_udf.py b/python/tests/test_udf.py
@@ -193,16 +193,16 @@ def test_local(self):
 pub fn nt2nt(i: Time) -> Result<Time, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn arr2arr(i: Option<Vec<Option<i32>>>) -> Result<Option<Vec<Option<i32>>>, Box<dyn std::error::Error>> {
+pub fn arr2arr(i: Option<Array<Option<i32>>>) -> Result<Option<Array<Option<i32>>>, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn narr2narr(i: Vec<Option<i32>>) -> Result<Vec<Option<i32>>, Box<dyn std::error::Error>> {
+pub fn narr2narr(i: Array<Option<i32>>) -> Result<Array<Option<i32>>, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn map2map(i: Option<BTreeMap<String, Option<String>>>) -> Result<Option<BTreeMap<String, Option<String>>>, Box<dyn std::error::Error>> {
+pub fn map2map(i: Option<Map<SqlString, Option<SqlString>>>) -> Result<Option<Map<SqlString, Option<SqlString>>>, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn nmap2nmap(i: BTreeMap<String, Option<String>>) -> Result<BTreeMap<String, Option<String>>, Box<dyn std::error::Error>> {
+pub fn nmap2nmap(i: Map<SqlString, Option<SqlString>>) -> Result<Map<SqlString, Option<SqlString>>, Box<dyn std::error::Error>> {
     Ok(i)
 }
 pub fn var2var(i: Option<Variant>) -> Result<Option<Variant>, Box<dyn std::error::Error>> {
@@ -217,10 +217,10 @@ def test_local(self):
 pub fn ndec2ndec(i: Decimal) -> Result<Decimal, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn str2str(i: Option<String>) -> Result<Option<String>, Box<dyn std::error::Error>> {
+pub fn str2str(i: Option<SqlString>) -> Result<Option<SqlString>, Box<dyn std::error::Error>> {
     Ok(i)
 }
-pub fn nstr2nstr(i: String) -> Result<String, Box<dyn std::error::Error>> {
+pub fn nstr2nstr(i: SqlString) -> Result<SqlString, Box<dyn std::error::Error>> {
     Ok(i)
 }
 // pub fn struct2struct(i: Option<struct_1>) -> Result<Option<struct_2>, Box<dyn std::error::Error>> {
diff --git a/python/uv.lock b/python/uv.lock
diff --git a/scripts/start_manager.sh b/scripts/start_manager.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp b/sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
diff --git a/sql-to-dbsp-compiler/build.sh b/sql-to-dbsp-compiler/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`kafka-python-ng==2.2.2`
`2`		`-pytest`
	`2`	`+pytest-timeout`
Original file line number	Diff line number	Diff line change
`@@ -193,16 +193,16 @@ def test_local(self):`
`193`	`193`	`pub fn nt2nt(i: Time) -> Result<Time, Box<dyn std::error::Error>> {`
`194`	`194`	`Ok(i)`
`195`	`195`	`}`
`196`		`-pub fn arr2arr(i: Option<Vec<Option<i32>>>) -> Result<Option<Vec<Option<i32>>>, Box<dyn std::error::Error>> {`
	`196`	`+pub fn arr2arr(i: Option<Array<Option<i32>>>) -> Result<Option<Array<Option<i32>>>, Box<dyn std::error::Error>> {`
`197`	`197`	`Ok(i)`
`198`	`198`	`}`
`199`		`-pub fn narr2narr(i: Vec<Option<i32>>) -> Result<Vec<Option<i32>>, Box<dyn std::error::Error>> {`
	`199`	`+pub fn narr2narr(i: Array<Option<i32>>) -> Result<Array<Option<i32>>, Box<dyn std::error::Error>> {`
`200`	`200`	`Ok(i)`
`201`	`201`	`}`
`202`		`-pub fn map2map(i: Option<BTreeMap<String, Option<String>>>) -> Result<Option<BTreeMap<String, Option<String>>>, Box<dyn std::error::Error>> {`
	`202`	`+pub fn map2map(i: Option<Map<SqlString, Option<SqlString>>>) -> Result<Option<Map<SqlString, Option<SqlString>>>, Box<dyn std::error::Error>> {`
`203`	`203`	`Ok(i)`
`204`	`204`	`}`
`205`		`-pub fn nmap2nmap(i: BTreeMap<String, Option<String>>) -> Result<BTreeMap<String, Option<String>>, Box<dyn std::error::Error>> {`
	`205`	`+pub fn nmap2nmap(i: Map<SqlString, Option<SqlString>>) -> Result<Map<SqlString, Option<SqlString>>, Box<dyn std::error::Error>> {`
`206`	`206`	`Ok(i)`
`207`	`207`	`}`
`208`	`208`	`pub fn var2var(i: Option<Variant>) -> Result<Option<Variant>, Box<dyn std::error::Error>> {`
`@@ -217,10 +217,10 @@ def test_local(self):`
`217`	`217`	`pub fn ndec2ndec(i: Decimal) -> Result<Decimal, Box<dyn std::error::Error>> {`
`218`	`218`	`Ok(i)`
`219`	`219`	`}`
`220`		`-pub fn str2str(i: Option<String>) -> Result<Option<String>, Box<dyn std::error::Error>> {`
	`220`	`+pub fn str2str(i: Option<SqlString>) -> Result<Option<SqlString>, Box<dyn std::error::Error>> {`
`221`	`221`	`Ok(i)`
`222`	`222`	`}`
`223`		`-pub fn nstr2nstr(i: String) -> Result<String, Box<dyn std::error::Error>> {`
	`223`	`+pub fn nstr2nstr(i: SqlString) -> Result<SqlString, Box<dyn std::error::Error>> {`
`224`	`224`	`Ok(i)`
`225`	`225`	`}`
`226`	`226`	`// pub fn struct2struct(i: Option<struct_1>) -> Result<Option<struct_2>, Box<dyn std::error::Error>> {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`
`3`	`3`	`set -e`
`4`	`4`