Merge pull request #999 from SUSE/ruby_hang

grisu48 · web-flow · commit 12703ae9fcfd · 2026-02-10T08:31:52.000+01:00
Simply stop the rails server rather than just killing it after 30
diff --git a/tests/test_ruby.py b/tests/test_ruby.py
@@ -123,5 +123,5 @@ def test_rails_template(auto_container_per_test):
         pytest.xfail("timezone data are not in the container")
 
     assert "Ruby on Rails" in auto_container_per_test.connection.check_output(
-        "cd /hello/ && (timeout 30 rails server > /dev/null &) && curl -sf --retry 5 --retry-connrefused http://localhost:3000",
+        "cd /hello/ && (timeout 60 rails server > /dev/null 2>&1 &) && curl -sf --retry 5 --retry-connrefused http://localhost:3000 && kill -TERM $(<tmp/pids/server.pid)",
     )

Original file line number	Diff line number	Diff line change
`@@ -123,5 +123,5 @@ def test_rails_template(auto_container_per_test):`
`123`	`123`	`pytest.xfail("timezone data are not in the container")`
`124`	`124`
`125`	`125`	`assert "Ruby on Rails" in auto_container_per_test.connection.check_output(`
`126`		`- "cd /hello/ && (timeout 30 rails server > /dev/null &) && curl -sf --retry 5 --retry-connrefused http://localhost:3000",`
	`126`	`+ "cd /hello/ && (timeout 60 rails server > /dev/null 2>&1 &) && curl -sf --retry 5 --retry-connrefused http://localhost:3000 && kill -TERM $(<tmp/pids/server.pid)",`
`127`	`127`	`)`