Tests: Add additional log output to the editable package tests

.rubocop.yml

@@ -4,6 +4,12 @@ require:
 AllCops:
   NewCops: enable
 
+Layout/TrailingWhitespace:
+  # Required since we use heredocs to assert against Hatchet output, and sometimes that output
+  # contains trailing newlines which we must match against. The alternative is to end the lines
+  # with the unsightly `#{' '}` workaround.
+  AllowInHeredoc: true
+
 Metrics/BlockLength:
   Enabled: false
 

spec/fixtures/requirements_editable/bin/compile

@@ -7,4 +7,6 @@ set -euo pipefail
 
 BUILD_DIR="${1}"
 
-exec "${BUILD_DIR}/bin/test-entrypoints"
+cd "${BUILD_DIR}"
+
+exec bin/test-entrypoints

spec/fixtures/requirements_editable/bin/test-entrypoints

@@ -2,6 +2,10 @@
 
 set -euo pipefail
 
+# List the filenames and contents of all .egg-link and .pth files in site-packages.
+find .heroku/python/lib*/*/site-packages/ -type f -and \( -name '*.egg-link' -or -name '*.pth' \) | sort | xargs -exec tail -n +1
+echo
+
 echo -n "Running entrypoint for the local package: "
 local_package
 

spec/hatchet/django_spec.rb

@@ -112,7 +112,7 @@
             remote:        Traceback \\(most recent call last\\):
             remote:        .*
             remote:        ModuleNotFoundError: No module named 'gettingstarted'
-            remote:#{' '}
+            remote: 
             remote:  !     Error while running '\\$ python manage.py collectstatic --noinput'.
           REGEX
         end

spec/hatchet/pip_spec.rb

@@ -91,7 +91,7 @@
     let(:buildpacks) { [:default, 'heroku-community/inline'] }
     let(:app) { Hatchet::Runner.new('spec/fixtures/requirements_editable', buildpacks: buildpacks) }
 
-    it 'rewrites .pth paths correctly for hooks, later buildpacks, runtime and cached builds' do
+    it 'rewrites .pth and .egg-link paths correctly for hooks, later buildpacks, runtime and cached builds' do
       app.deploy do |app|
         expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX))
           remote: -----> Installing requirements with pip
@@ -103,18 +103,48 @@
           remote:          Running setup.py develop for local-package
           remote:        Successfully installed gunicorn local-package
           remote: -----> Running post-compile hook
+          remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <==
+          remote: /app/.heroku/src/gunicorn
+          remote: /tmp/build_.*/local_package
+          remote: 
+          remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <==
+          remote: /app/.heroku/src/gunicorn
+          remote: .
+          remote: ==> .heroku/python/lib/python.*/site-packages/local-package.egg-link <==
+          remote: /tmp/build_.*/local_package
+          remote: .
           remote: Running entrypoint for the local package: Hello!
           remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\)
           remote: -----> Inline app detected
+          remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <==
+          remote: /app/.heroku/src/gunicorn
+          remote: /app/local_package
+          remote: 
+          remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <==
+          remote: /app/.heroku/src/gunicorn
+          remote: .
+          remote: ==> .heroku/python/lib/python.*/site-packages/local-package.egg-link <==
+          remote: /tmp/build_.*/local_package
+          remote: .
           remote: Running entrypoint for the local package: Hello!
           remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\)
         REGEX
 
         # Test rewritten paths work at runtime.
-        expect(app.run('bin/test-entrypoints')).to include(<<~OUTPUT)
+        expect(app.run('bin/test-entrypoints')).to match(Regexp.new(<<~REGEX))
+          ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <==
+          /app/.heroku/src/gunicorn
+          /app/local_package
+
+          ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <==
+          /app/.heroku/src/gunicorn
+          .
+          ==> .heroku/python/lib/python.*/site-packages/local-package.egg-link <==
+          /tmp/build_.*/local_package
+          .
           Running entrypoint for the local package: Hello!
-          Running entrypoint for the VCS package: gunicorn (version 20.1.0)
-        OUTPUT
+          Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\)
+        REGEX
 
         # Test restoring paths in the cached .pth files works correctly.
         app.commit!
@@ -137,9 +167,29 @@
           remote:          Running setup.py develop for local-package
           remote:        Successfully installed gunicorn local-package
           remote: -----> Running post-compile hook
+          remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <==
+          remote: /tmp/build_.*/local_package
+          remote: /app/.heroku/src/gunicorn
+          remote: 
+          remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <==
+          remote: /app/.heroku/src/gunicorn
+          remote: .
+          remote: ==> .heroku/python/lib/python.*/site-packages/local-package.egg-link <==
+          remote: /tmp/build_.*/local_package
+          remote: .
           remote: Running entrypoint for the local package: Hello!
           remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\)
           remote: -----> Inline app detected
+          remote: ==> .heroku/python/lib/python.*/site-packages/easy-install.pth <==
+          remote: /app/local_package
+          remote: /app/.heroku/src/gunicorn
+          remote: 
+          remote: ==> .heroku/python/lib/python.*/site-packages/gunicorn.egg-link <==
+          remote: /app/.heroku/src/gunicorn
+          remote: .
+          remote: ==> .heroku/python/lib/python.*/site-packages/local-package.egg-link <==
+          remote: /tmp/build_.*/local_package
+          remote: .
           remote: Running entrypoint for the local package: Hello!
           remote: Running entrypoint for the VCS package: gunicorn \\(version 20.1.0\\)
         REGEX