From: Eric Wong <bofh@yhbt.net> To: unicorn-public@yhbt.net Subject: [PATCH 1/3] test/exec/test_exec: bring worker_processes down to 2 Date: Sun, 26 Jan 2020 05:33:31 +0000 [thread overview] Message-ID: <20200126053333.28163-2-bofh@yhbt.net> (raw) In-Reply-To: <20200126053333.28163-1-bofh@yhbt.net> My hardware gets worse and worse every year :< --- test/exec/test_exec.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index 8a6b43e..32734c1 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -45,8 +45,9 @@ def call(env) COMMON_TMP = Tempfile.new('unicorn_tmp') unless defined?(COMMON_TMP) + HEAVY_WORKERS = 2 HEAVY_CFG = <<-EOS -worker_processes 4 +worker_processes #{HEAVY_WORKERS} timeout 30 logger Logger.new('#{COMMON_TMP.path}') before_fork do |server, worker| @@ -606,6 +607,7 @@ def test_unicorn_config_listen_augments_cli def test_weird_config_settings File.open("config.ru", "wb") { |fp| fp.syswrite(HI) } ucfg = Tempfile.new('unicorn_test_config') + proc_total = HEAVY_WORKERS + 1 # + 1 for master ucfg.syswrite(HEAVY_CFG) pid = xfork do redirect_test_io do @@ -616,9 +618,9 @@ def test_weird_config_settings results = retry_hit(["http://#{@addr}:#{@port}/"]) assert_equal String, results[0].class wait_master_ready(COMMON_TMP.path) - wait_workers_ready(COMMON_TMP.path, 4) + wait_workers_ready(COMMON_TMP.path, HEAVY_WORKERS) bf = File.readlines(COMMON_TMP.path).grep(/\bbefore_fork: worker=/) - assert_equal 4, bf.size + assert_equal HEAVY_WORKERS, bf.size rotate = Tempfile.new('unicorn_rotate') File.rename(COMMON_TMP.path, rotate.path) @@ -630,20 +632,20 @@ def test_weird_config_settings tries = DEFAULT_TRIES log = File.readlines(rotate.path) while (tries -= 1) > 0 && - log.grep(/reopening logs\.\.\./).size < 5 + log.grep(/reopening logs\.\.\./).size < proc_total sleep DEFAULT_RES log = File.readlines(rotate.path) end - assert_equal 5, log.grep(/reopening logs\.\.\./).size + assert_equal proc_total, log.grep(/reopening logs\.\.\./).size assert_equal 0, log.grep(/done reopening logs/).size tries = DEFAULT_TRIES log = File.readlines(COMMON_TMP.path) - while (tries -= 1) > 0 && log.grep(/done reopening logs/).size < 5 + while (tries -= 1) > 0 && log.grep(/done reopening logs/).size < proc_total sleep DEFAULT_RES log = File.readlines(COMMON_TMP.path) end - assert_equal 5, log.grep(/done reopening logs/).size + assert_equal proc_total, log.grep(/done reopening logs/).size assert_equal 0, log.grep(/reopening logs\.\.\./).size Process.kill(:QUIT, pid)
next prev parent reply other threads:[~2020-01-26 5:33 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-26 5:33 [PATCH 0/3] minor test golfing to make worktree smaller Eric Wong 2020-01-26 5:33 ` Eric Wong [this message] 2020-01-26 5:33 ` [PATCH 2/3] test_helper: remove unused `chunked_spawn' Eric Wong 2020-01-26 5:33 ` [PATCH 3/3] test_upload: use spawn to simplify redirects Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://yhbt.net/unicorn/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200126053333.28163-2-bofh@yhbt.net \ --to=bofh@yhbt.net \ --cc=unicorn-public@yhbt.net \ --subject='Re: [PATCH 1/3] test/exec/test_exec: bring worker_processes down to 2' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: ../../unicorn.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).