aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/ruby-puma-ignore-broken-test.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch
index fb653dc0ee..8961ffa4ca 100644
--- a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch
+++ b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch
@@ -1,13 +1,13 @@
-diff --git a/test/test_integration.rb b/test/test_integration.rb
-index d9b189c..6e21180 100644
---- a/test/test_integration.rb
-+++ b/test/test_integration.rb
-@@ -115,7 +115,7 @@ class TestIntegration < Test::Unit::TestCase
- assert_kind_of Thread, t.join(1), "server didn't stop"
- end
+diff --git a/test/test_cli.rb b/test/test_cli.rb
+index 9c515c6..6bd439f 100644
+--- a/test/test_cli.rb
++++ b/test/test_cli.rb
+@@ -88,7 +88,7 @@ class TestCLI < Test::Unit::TestCase
+ s << "GET /stats HTTP/1.0\r\n\r\n"
+ body = s.read
-- def test_phased_restart_via_pumactl
-+ def no_test_phased_restart_via_pumactl
- if Puma.jruby? || Puma.windows?
- assert true
- return
+- assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last)
++ #assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last)
+
+ # wait until the first status ping has come through
+ sleep 6