Fix failing tests

- Remove compat unit tests that are no longer needed
- Only add the compat layer path to the layers for an image if the
  compat.tar exists
- `make acceptance` should only require previous pack fixtures to be a
  valid directory if the env variable is set

Signed-off-by: Natalie Arellano <narellano@pivotal.io>
Signed-off-by: Andrew Meyer <ameyer@pivotal.io>

acceptance/acceptance_test.go

@@ -89,11 +89,19 @@ func TestAcceptance(t *testing.T) {
 	}
 
 	previousPackFixturesPath := os.Getenv(envPreviousPackFixturesPath)
+	var tmpPreviousPackFixturesPath string
 	if previousPackFixturesPath != "" {
 		previousPackFixturesPath, err = filepath.Abs(previousPackFixturesPath)
 		if err != nil {
 			t.Fatal(err)
 		}
+
+		tmpPreviousPackFixturesPath, err := ioutil.TempDir("", "previous-pack-fixtures")
+		h.AssertNil(t, err)
+		defer os.RemoveAll(tmpPreviousPackFixturesPath)
+
+		h.RecursiveCopy(t, previousPackFixturesPath, tmpPreviousPackFixturesPath)
+		h.RecursiveCopy(t, filepath.Join("testdata", "pack_previous_fixtures_overrides"), tmpPreviousPackFixturesPath)
 	}
 
 	lifecycleDescriptor := builder.LifecycleDescriptor{
@@ -142,13 +150,6 @@ func TestAcceptance(t *testing.T) {
 		h.AssertNil(t, err)
 	}
 
-	tmpPreviousPackFixturesPath, err := ioutil.TempDir("", "previous-pack-fixtures")
-	h.AssertNil(t, err)
-	defer os.RemoveAll(tmpPreviousPackFixturesPath)
-
-	h.RecursiveCopy(t, previousPackFixturesPath, tmpPreviousPackFixturesPath)
-	h.RecursiveCopy(t, filepath.Join("testdata", "pack_previous_fixtures_overrides"), tmpPreviousPackFixturesPath)
-
 	resolvedCombos, err := resolveRunCombinations(
 		combos,
 		packPath,

internal/build/phase_test.go

@@ -197,7 +197,7 @@ func testPhase(t *testing.T, when spec.G, it spec.S) {
 					phase, err := subject.NewPhase("phase", build.WithArgs("some", "args"))
 					h.AssertNil(t, err)
 					assertRunSucceeds(t, phase, &outBuf, &errBuf)
-					h.AssertContains(t, outBuf.String(), `received args [/lifecycle/phase some args]`)
+					h.AssertContains(t, outBuf.String(), `received args [/cnb/lifecycle/phase some args]`)
 				})
 			})
 

internal/build/testdata/fake-lifecycle/Dockerfile

@@ -3,17 +3,10 @@ FROM golang
 RUN mkdir /lifecycle
 WORKDIR /go/src/step
 COPY . .
-RUN GO111MODULE=on go build -mod=vendor -o /lifecycle/phase ./phase.go
-
-RUN mkdir -p /buildpacks
-RUN echo '[[groups]]\n\
-[[groups.buildpacks]]\n\
-id = orig.buildpack.id\n\
-version = orig.buildpack.version\n'\
-> /buildpacks/order.toml
+RUN GO111MODULE=on go build -mod=vendor -o /cnb/lifecycle/phase ./phase.go
 
 ENV CNB_USER_ID 111
 ENV CNB_GROUP_ID 222
 
 LABEL io.buildpacks.stack.id="test.stack"
-LABEL io.buildpacks.builder.metadata="{\"buildpacks\":[{\"id\":\"just/buildpack.id\",\"version\":\"1.2.3\"}],\"groups\":[{\"buildpacks\":[{\"id\":\"orig.buildpack.id\",\"version\":\"orig.buildpack.version\"}]}],\"lifecycle\":{\"version\":\"0.5.0\",\"api\":{\"buildpack\":\"0.2\",\"platform\":\"0.1\"}}}"
+LABEL io.buildpacks.builder.metadata="{\"buildpacks\":[{\"id\":\"just/buildpack.id\",\"version\":\"1.2.3\"}],\"lifecycle\":{\"version\":\"0.5.0\",\"api\":{\"buildpack\":\"0.2\",\"platform\":\"0.1\"}}}"

internal/builder/builder.go

@@ -327,8 +327,10 @@ func (b *Builder) Save(logger logging.Logger) error {
 		return err
 	}
 
-	if err := b.image.AddLayer(compatTar); err != nil {
-		return errors.Wrap(err, "adding compat.tar layer")
+	if compatTar != "" {
+		if err := b.image.AddLayer(compatTar); err != nil {
+			return errors.Wrap(err, "adding compat.tar layer")
+		}
 	}
 
 	envTar, err := b.envLayer(tmpDir, b.env)

internal/builder/compat.go

@@ -17,6 +17,10 @@ const (
 )
 
 func (b *Builder) compatLayer(order dist.Order, dest string) (string, error) {
+	if b.lifecycle == nil {
+		return "", nil
+	}
+
 	compatTar := path.Join(dest, "compat.tar")
 	fh, err := os.Create(compatTar)
 	if err != nil {
@@ -27,10 +31,8 @@ func (b *Builder) compatLayer(order dist.Order, dest string) (string, error) {
 	tw := tar.NewWriter(fh)
 	defer tw.Close()
 
-	if b.lifecycle != nil {
-		if err := compatLifecycle(tw); err != nil {
-			return "", err
-		}
+	if err := compatLifecycle(tw); err != nil {
+		return "", err
 	}
 
 	return compatTar, nil