Skip to content

Commit

Permalink
Unskip env var tests on Heroku-22 (#1668)
Browse files Browse the repository at this point in the history
Since Heroku-22 has now been migrated to the new build infrastructure,
so no longer has the small system env var differences that were causing
these tests to fail on that stack (which is why they had been skipped as
part of #1634).
  • Loading branch information
edmorley authored Oct 24, 2024
1 parent bf2ce13 commit d92180d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
4 changes: 1 addition & 3 deletions spec/hatchet/hooks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
require_relative '../spec_helper'

RSpec.describe 'Compile hooks' do
# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
context 'when an app has bin/pre_compile and bin/post_compile scripts', stacks: %w[heroku-20 heroku-24] do
context 'when an app has bin/pre_compile and bin/post_compile scripts' do
let(:app) { Hatchet::Runner.new('spec/fixtures/hooks', config: { 'SOME_APP_CONFIG_VAR' => '1' }) }

it 'runs the hooks with the correct environment' do
Expand Down
4 changes: 1 addition & 3 deletions spec/hatchet/pip_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
end

RSpec.describe 'pip support' do
# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
context 'when requirements.txt is unchanged since the last build', stacks: %w[heroku-20 heroku-24] do
context 'when requirements.txt is unchanged since the last build' do
let(:buildpacks) { [:default, 'heroku-community/inline'] }
let(:app) { Hatchet::Runner.new('spec/fixtures/requirements_basic', buildpacks:) }

Expand Down
5 changes: 1 addition & 4 deletions spec/hatchet/pipenv_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
let(:buildpacks) { [:default, 'heroku-community/inline'] }
let(:app) { Hatchet::Runner.new('spec/fixtures/pipenv_basic', buildpacks:) }

# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
it 'builds with the specified python_version and re-uses packages from the cache',
stacks: %w[heroku-20 heroku-24] do
it 'builds with the specified python_version and re-uses packages from the cache' do
app.deploy do |app|
# TODO: We should not be leaking the Pipenv installation into the app environment.
expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX))
Expand Down

0 comments on commit d92180d

Please sign in to comment.