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

sort configs/rackups/tests (#1268)

Browse source
This commit is contained in:
Michael Grosser 2017-04-11 14:08:18 -07:00 committed by Nate Berkopec
parent 3e519e13bd
commit 61de1a8891
17 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
test/ab_rs.rb → test/config/ab_rs.rb
View file

0
test/config.rb → test/config/simple.rb
View file

0
test/ssl_config.rb → test/config/ssl_config.rb
View file

0
test/hello-bind.ru → test/rackup/hello-bind.ru
View file

0
test/hello-delay.ru → test/rackup/hello-delay.ru
View file

0
test/hello-map.ru → test/rackup/hello-map.ru
View file

0
test/hello-post.ru → test/rackup/hello-post.ru
View file

0
test/hello-stuck.ru → test/rackup/hello-stuck.ru
View file

0
test/hello-tcp.ru → test/rackup/hello-tcp.ru
View file

0
test/hello.ru → test/rackup/hello.ru
View file

0
test/hijack.ru → test/rackup/hijack.ru
View file

0
test/hijack2.ru → test/rackup/hijack2.ru
View file

0
test/lobster.ru → test/rackup/lobster.ru
View file

0
test/slow.ru → test/rackup/slow.ru
View file

8
test/test_cli.rb
View file

@ -44,7 +44,7 @@ class TestCLI < Minitest::Test
cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876", cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
"--control", url, "--control", url,
"--control-token", "", "--control-token", "",
"test/lobster.ru"], @events "test/rackup/lobster.ru"], @events
t = Thread.new do t = Thread.new do
Thread.current.abort_on_exception = true Thread.current.abort_on_exception = true
@ -71,7 +71,7 @@ class TestCLI < Minitest::Test
"-w", "2", "-w", "2",
"--control", url, "--control", url,
"--control-token", "", "--control-token", "",
"test/lobster.ru"], @events "test/rackup/lobster.ru"], @events
t = Thread.new { cli.run } t = Thread.new { cli.run }
t.abort_on_exception = true t.abort_on_exception = true
@ -106,7 +106,7 @@ class TestCLI < Minitest::Test
cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
"--control", url, "--control", url,
"--control-token", "", "--control-token", "",
"test/lobster.ru"], @events "test/rackup/lobster.ru"], @events
t = Thread.new { cli.run } t = Thread.new { cli.run }
t.abort_on_exception = true t.abort_on_exception = true
@ -129,7 +129,7 @@ class TestCLI < Minitest::Test
cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
"--control", url, "--control", url,
"--control-token", "", "--control-token", "",
"test/lobster.ru"], @events "test/rackup/lobster.ru"], @events
t = Thread.new { cli.run } t = Thread.new { cli.run }
t.abort_on_exception = true t.abort_on_exception = true

2
test/test_config.rb
View file

@ -5,7 +5,7 @@ require "puma/configuration"
class TestConfigFile < Minitest::Test class TestConfigFile < Minitest::Test
def test_app_from_rackup def test_app_from_rackup
conf = Puma::Configuration.new do |c| conf = Puma::Configuration.new do |c|
c.rackup "test/hello-bind.ru" c.rackup "test/rackup/hello-bind.ru"
end end
conf.load conf.load

8
test/test_integration.rb
View file

@ -109,7 +109,7 @@ class TestIntegration < Minitest::Test
c.state_path @state_path c.state_path @state_path
c.bind "unix://#{@bind_path}" c.bind "unix://#{@bind_path}"
c.activate_control_app "unix://#{@control_path}", :auth_token => @token c.activate_control_app "unix://#{@control_path}", :auth_token => @token
c.rackup "test/hello.ru" c.rackup "test/rackup/hello.ru"
end end
l = Puma::Launcher.new conf, :events => @events l = Puma::Launcher.new conf, :events => @events
@ -149,7 +149,7 @@ class TestIntegration < Minitest::Test
c.activate_control_app "unix://#{@control_path}", :auth_token => @token c.activate_control_app "unix://#{@control_path}", :auth_token => @token
c.workers 2 c.workers 2
c.worker_shutdown_timeout 1 c.worker_shutdown_timeout 1
c.rackup "test/hello-stuck.ru" c.rackup "test/rackup/hello-stuck.ru"
end end
l = Puma::Launcher.new conf, :events => @events l = Puma::Launcher.new conf, :events => @events
@ -209,7 +209,7 @@ class TestIntegration < Minitest::Test
end end
def test_restart_closes_keepalive_sockets def test_restart_closes_keepalive_sockets
server("-q test/hello.ru") server("-q test/rackup/hello.ru")
s = connect s = connect
s.read s.read
@ -226,7 +226,7 @@ class TestIntegration < Minitest::Test
return return
end end
server("-q -w 2 test/hello.ru") server("-q -w 2 test/rackup/hello.ru")
s = connect s = connect
s.read s.read