diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2019-03-22 07:49:38 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2019-03-22 07:49:38 +0900 |
| commit | efb706daad0e2e1039c6abb4879c837ef8bf4d10 (patch) | |
| tree | 0633834983ac32d80ab5a7191699cab8061687e2 | |
| parent | 382a9563a3bc3dd1982f4db1258e8f0e7f5fac8e (diff) | |
| download | rails-efb706daad0e2e1039c6abb4879c837ef8bf4d10.tar.gz rails-efb706daad0e2e1039c6abb4879c837ef8bf4d10.tar.bz2 rails-efb706daad0e2e1039c6abb4879c837ef8bf4d10.zip | |
Fix server restart test on Puma 3.12.1
Since https://github.com/puma/puma/pull/1700, the default host is
correctly used. So `localhost` is used instead of `0.0.0.0`.
As a result, the log output on restart is changed, and the restart test
fails on Puma 3.12.1.
https://travis-ci.org/rails/rails/jobs/509239592#L2303-L2305
Specify binding explicitly to avoid being affected by Puma changes.
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | railties/test/application/server_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6a8f9040d7..1a5ca8d49e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,8 +356,8 @@ GEM powerpack (0.1.2) psych (3.0.3) public_suffix (3.0.3) - puma (3.12.0) - puma (3.12.0-java) + puma (3.12.1) + puma (3.12.1-java) que (0.14.3) qunit-selenium (0.0.4) selenium-webdriver diff --git a/railties/test/application/server_test.rb b/railties/test/application/server_test.rb index 9df36b3444..5fe1b4e6e7 100644 --- a/railties/test/application/server_test.rb +++ b/railties/test/application/server_test.rb @@ -30,13 +30,13 @@ module ApplicationTests pid = nil Bundler.with_original_env do - pid = Process.spawn("bin/rails server -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica) + pid = Process.spawn("bin/rails server -b localhost -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica) assert_output("Listening", primary) rails("restart") assert_output("Restarting", primary) - assert_output("Inherited", primary) + assert_output("tcp://localhost:3000", primary) ensure kill(pid) if pid end |