kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

review updates

Browse source
This commit is contained in:
MSP-Greg 2019-10-01 11:28:33 -05:00
parent 7b228da3f6
commit 8ad26eb662
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
History.md
View file

@ -4,7 +4,7 @@
* Your feature goes here (#Github Number) * Your feature goes here (#Github Number)
* Bugfixes * Bugfixes
* Fix handling of pre-existing/systemd unix binder files (#1842, #1988) * Fix socket activation of systemd (pre-existing) unix binder files (#1842, #1988)
* Deal with multiple calls to bind correctly (#1986, #1994, #2006) * Deal with multiple calls to bind correctly (#1986, #1994, #2006)
## 4.2.0 / 2019-09-23 ## 4.2.0 / 2019-09-23

6
test/test_binder.rb
View file

@ -82,13 +82,17 @@ class TestBinder < TestBinderBase
skip UNIX_SKT_MSG unless UNIX_SKT_EXIST skip UNIX_SKT_MSG unless UNIX_SKT_EXIST
unix_path = "test/#{name}_server.sock" unix_path = "test/#{name}_server.sock"
File.open(unix_path, mode: 'wb') { |f| f.puts 'pre eixisting' } File.open(unix_path, mode: 'wb') { |f| f.puts 'pre existing' }
@binder.parse ["unix://#{unix_path}"], @events @binder.parse ["unix://#{unix_path}"], @events
assert_match %r!unix://#{unix_path}!, @events.stdout.string assert_match %r!unix://#{unix_path}!, @events.stdout.string
refute_includes @binder.instance_variable_get(:@unix_paths), unix_path refute_includes @binder.instance_variable_get(:@unix_paths), unix_path
@binder.close_unix_paths
assert File.exist?(unix_path)
ensure ensure
if UNIX_SKT_EXIST if UNIX_SKT_EXIST
File.unlink unix_path if File.exist? unix_path File.unlink unix_path if File.exist? unix_path

4
test/test_integration_cluster.rb
View file

@ -19,9 +19,9 @@ class TestIntegrationCluster < TestIntegration
def test_pre_existing_unix def test_pre_existing_unix
skip UNIX_SKT_MSG unless UNIX_SKT_EXIST skip UNIX_SKT_MSG unless UNIX_SKT_EXIST
File.open(@bind_path, mode: 'wb') { |f| f.puts 'pre eixisting' } File.open(@bind_path, mode: 'wb') { |f| f.puts 'pre existing' }
cli_server "-w #{WORKERS} -t 0:6 -q test/rackup/sleep_step.ru", unix: :unix cli_server "-w #{WORKERS} -q test/rackup/sleep_step.ru", unix: :unix
stop_server stop_server