Skip to content

Fix intermittent profile.d/ scripts test failure from extra trailing newline #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edmorley merged 1 commit into from
Jun 8, 2026
Merged

Fix intermittent profile.d/ scripts test failure from extra trailing newline #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions spec/hatchet/profile_d_scripts_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
'WEB_CONCURRENCY=this-should-be-preserved',
]
app.run_multi(list_envs_cmd, heroku: { env: user_env_vars.join(';'), type: 'example-worker' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
DYNO_RAM=512
FORWARDED_ALLOW_IPS=*
GUNICORN_CMD_ARGS=this-should-be-preserved
Expand All @@ -48,7 +48,7 @@
# Check WEB_CONCURRENCY support when using a Standard-1X dyno.
# We set the process type to `web` so that we can test the web-dyno-only log output.
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'standard-1x', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 512 MB available memory and 8 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 2 based on the available memory.
DYNO_RAM=512
Expand All @@ -59,7 +59,7 @@

# Standard-2X
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'standard-2x', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 1024 MB available memory and 8 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 4 based on the available memory.
DYNO_RAM=1024
Expand All @@ -70,7 +70,7 @@

# Performance-M
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'performance-m', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 2560 MB available memory and 2 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 5 based on the number of CPU cores.
DYNO_RAM=2560
Expand All @@ -81,7 +81,7 @@

# Performance-L
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'performance-l', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 14336 MB available memory and 8 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 17 based on the number of CPU cores.
DYNO_RAM=14336
Expand All @@ -92,7 +92,7 @@

# Performance-L-RAM
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'performance-l-ram', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 30720 MB available memory and 4 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 9 based on the number of CPU cores.
DYNO_RAM=30720
Expand All @@ -103,7 +103,7 @@

# Performance-XL
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'performance-xl', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 63488 MB available memory and 8 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 17 based on the number of CPU cores.
DYNO_RAM=63488
Expand All @@ -114,7 +114,7 @@

# Performance-2XL
app.run_multi(list_concurrency_envs_cmd, heroku: { size: 'performance-2xl', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 129024 MB available memory and 16 CPU cores.
Python buildpack: Defaulting WEB_CONCURRENCY to 33 based on the number of CPU cores.
DYNO_RAM=129024
Expand All @@ -125,7 +125,7 @@

# Check that WEB_CONCURRENCY is preserved if set, but that we still set DYNO_RAM.
app.run_multi(list_concurrency_envs_cmd, heroku: { env: 'WEB_CONCURRENCY=999', type: 'web' }) do |output, _|
expect(output).to eq(<<~OUTPUT)
expect(normalize_trailing_newlines(output)).to eq(<<~OUTPUT)
Python buildpack: Detected 512 MB available memory and 8 CPU cores.
Python buildpack: Skipping automatic configuration of WEB_CONCURRENCY since it's already set.
DYNO_RAM=512
Expand Down
6 changes: 6 additions & 0 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ def clean_output(output)
.gsub(/\e\[[0-9;]+m/, '')
end

def normalize_trailing_newlines(output)
# The platform log stream that captures `run`/`run_multi` command output occasionally appends
# an extra trailing newline, which otherwise intermittently breaks exact output assertions.
output.sub(/\n+\z/, "\n")
end

def update_buildpacks(app, buildpacks)
# Updates the list of buildpacks for an existing app, until Hatchet supports this natively:
# https://github.com/heroku/hatchet/issues/166
Expand Down