diff options
| author | Marius Bakke <[email protected]> | 2017-08-26 15:34:29 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2017-08-26 15:34:29 +0200 |
| commit | 4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch) | |
| tree | 17bac0c3211a872d3a0292cae20347718ecdd5f7 /gnu/packages/patches/ruby-puma-ignore-broken-test.patch | |
| parent | 9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff) | |
| parent | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/ruby-puma-ignore-broken-test.patch')
| -rw-r--r-- | gnu/packages/patches/ruby-puma-ignore-broken-test.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch deleted file mode 100644 index 8961ffa4ca..0000000000 --- a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - -- 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 |