From 3532b8db712d1d6daa0a656b0fde317af9b8ae53 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 28 Apr 2017 13:51:19 +0200
Subject: [PATCH] Remove config lines in one place
---
spec/unicorn/unicorn_spec.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spec/unicorn/unicorn_spec.rb b/spec/unicorn/unicorn_spec.rb
index 1214bd96c0d48..8518c047a470e 100644
--- a/spec/unicorn/unicorn_spec.rb
+++ b/spec/unicorn/unicorn_spec.rb
@@ -11,22 +11,22 @@
# Remove these because they make setup harder.
config_lines = config_lines.reject do |line|
%w[
+ working_directory
+ worker_processes
+ listen
pid
stderr_path
stdout_path
].any? { |prefix| line.start_with?(prefix) }
end
- config_lines = config_lines.reject { |l| l.start_with?('working_directory') }
config_lines << "working_directory '#{Rails.root}'"
# We want to have exactly 1 worker process because that makes it
# predictable which process will handle our requests.
- config_lines = config_lines.reject { |l| l.start_with?('worker_processes') }
config_lines << 'worker_processes 1'
@socket_path = File.join(Dir.pwd, 'tmp/tests/unicorn.socket')
- config_lines = config_lines.reject { |l| l.start_with?('listen') }
config_lines << "listen '#{@socket_path}'"
ready_file = 'tmp/tests/unicorn-worker-ready'
--
GitLab