Uses occam.Source to allow integration specs to run in parallel (#26)

occam.Source duplicates the source code directory and makes it unique by
adding a file with unique random content.

Co-authored-by: Daniel Thornton <dthornton@pivotal.io>

Author: ryanmoran

integration/init_test.go

@@ -34,19 +34,19 @@ func TestIntegration(t *testing.T) {
 	Expect(err).NotTo(HaveOccurred())
 
 	bundleInstallURI, err = dagger.PackageBuildpack(bpDir)
-	Expect(err).ToNot(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred())
 
 	// HACK: we need to fix dagger and the package.sh scripts so that this isn't required
 	bundleInstallURI = fmt.Sprintf("%s.tgz", bundleInstallURI)
 
 	bundlerURI, err = dagger.GetLatestCommunityBuildpack("cloudfoundry", "bundler-cnb")
-	Expect(err).ToNot(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred())
 
 	mriURI, err = dagger.GetLatestCommunityBuildpack("cloudfoundry", "mri-cnb")
-	Expect(err).ToNot(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred())
 
 	buildPlanURI, err = dagger.GetLatestCommunityBuildpack("ForestEckhardt", "build-plan")
-	Expect(err).ToNot(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred())
 
 	defer func() {
 		dagger.DeleteBuildpack(bundleInstallURI)
@@ -57,7 +57,7 @@ func TestIntegration(t *testing.T) {
 
 	SetDefaultEventuallyTimeout(10 * time.Second)
 
-	suite := spec.New("Integration", spec.Parallel(), spec.Report(report.Terminal{}))
+	suite := spec.New("Integration", spec.Report(report.Terminal{}), spec.Parallel())
 	suite("SimpleApp", testSimpleApp)
 	suite("Logging", testLogging)
 

integration/logging_test.go

@@ -2,6 +2,7 @@ package integration_test
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -27,7 +28,9 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
 	context("when the buildpack is run with pack build", func() {
 		var (
 			image occam.Image
-			name  string
+
+			name   string
+			source string
 		)
 
 		it.Before(func() {
@@ -39,19 +42,23 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
 		it.After(func() {
 			Expect(docker.Image.Remove.Execute(image.ID)).To(Succeed())
 			Expect(docker.Volume.Remove.Execute(occam.CacheVolumeNames(name))).To(Succeed())
+			Expect(os.RemoveAll(source)).To(Succeed())
 		})
 
 		it("logs useful information for the user", func() {
 			var err error
+			source, err = occam.Source(filepath.Join("testdata", "simple_app"))
+			Expect(err).NotTo(HaveOccurred())
+
 			var logs fmt.Stringer
 			image, logs, err = pack.WithNoColor().Build.
 				WithNoPull().
 				WithBuildpacks(mriURI, bundlerURI, bundleInstallURI, buildPlanURI).
-				Execute(name, filepath.Join("testdata", "simple_app"))
-			Expect(err).ToNot(HaveOccurred(), logs.String)
+				Execute(name, source)
+			Expect(err).NotTo(HaveOccurred(), logs.String)
 
 			buildpackVersion, err := GetGitVersion()
-			Expect(err).ToNot(HaveOccurred())
+			Expect(err).NotTo(HaveOccurred())
 
 			Expect(logs).To(ContainLines(
 				fmt.Sprintf("Bundle Install Buildpack %s", buildpackVersion),

integration/simple_app_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -33,7 +34,8 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 			image     occam.Image
 			container occam.Container
 
-			name string
+			name   string
+			source string
 		)
 
 		it.Before(func() {
@@ -46,14 +48,18 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 			Expect(docker.Container.Remove.Execute(container.ID)).To(Succeed())
 			Expect(docker.Image.Remove.Execute(image.ID)).To(Succeed())
 			Expect(docker.Volume.Remove.Execute(occam.CacheVolumeNames(name))).To(Succeed())
+			Expect(os.RemoveAll(source)).To(Succeed())
 		})
 
 		it("creates a working OCI image", func() {
 			var err error
+			source, err = occam.Source(filepath.Join("testdata", "simple_app"))
+			Expect(err).NotTo(HaveOccurred())
+
 			image, _, err = pack.WithVerbose().Build.
 				WithBuildpacks(mriURI, bundlerURI, bundleInstallURI, buildPlanURI).
 				WithNoPull().
-				Execute(name, filepath.Join("testdata", "simple_app"))
+				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred())
 
 			container, err = docker.Container.Run.
@@ -78,10 +84,13 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 		context("the version of bundler in the Gemfile.lock is 1.17.x", func() {
 			it("creates a working OCI image", func() {
 				var err error
+				source, err = occam.Source(filepath.Join("testdata", "bundler_version_1_17"))
+				Expect(err).NotTo(HaveOccurred())
+
 				image, _, err = pack.WithVerbose().Build.
 					WithBuildpacks(mriURI, bundlerURI, bundleInstallURI, buildPlanURI).
 					WithNoPull().
-					Execute(name, filepath.Join("testdata", "bundler_version_1_17"))
+					Execute(name, source)
 				Expect(err).NotTo(HaveOccurred())
 
 				container, err = docker.Container.Run.