diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-11-08 22:16:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 22:16:46 -0500 |
| commit | fa7f42d63400e3a452a2de2316a43351f6e03f6f (patch) | |
| tree | ee2fd568bd80abca248dea6b0cee413e5a3ea5e1 /actionview/Rakefile | |
| parent | 37239710d1e67af552d339a244155a99706e8779 (diff) | |
| parent | 2a6852c6ef272b404f97058b0afc9d460e05777c (diff) | |
| download | rails-fa7f42d63400e3a452a2de2316a43351f6e03f6f.tar.gz rails-fa7f42d63400e3a452a2de2316a43351f6e03f6f.tar.bz2 rails-fa7f42d63400e3a452a2de2316a43351f6e03f6f.zip | |
Merge pull request #31095 from y-yagi/correctly_kill_the_server_in_ujs_test
Correctly kill the server started with ujs test
Diffstat (limited to 'actionview/Rakefile')
| -rw-r--r-- | actionview/Rakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/Rakefile b/actionview/Rakefile index 9e5ef35334..8650f541b0 100644 --- a/actionview/Rakefile +++ b/actionview/Rakefile @@ -32,7 +32,7 @@ namespace :test do task :ujs do begin Dir.mkdir("log") - pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1") + pid = spawn("bundle exec rackup test/ujs/config.ru -p 4567 -s puma > log/test.log 2>&1", pgroup: true) start_time = Time.now @@ -48,7 +48,7 @@ namespace :test do system("npm run lint && bundle exec ruby ../ci/qunit-selenium-runner.rb http://localhost:4567/") status = $?.exitstatus ensure - Process.kill("KILL", pid) if pid + Process.kill("KILL", -pid) if pid FileUtils.rm_rf("log") end |