Fix unit tests

ndon55555 · kardolus · ndon55555 · commit da652f360fcf · 2019-07-15T13:58:32.000-04:00
Co-authored-by: Guillermo Kardolus &lt;gkardolus@pivotal.io&gt;
diff --git a/src/python/supply/supply.go b/src/python/supply/supply.go
@@ -638,10 +638,8 @@ func (s *Supplier) RunPipVendored() error {
 	}
 
 	if hasBuildOptions() {
-		s.Log.Info("Using the pip no build isolation flag")
+		s.Log.Info("Using the pip --no-build-isolation flag since it is available")
 		installArgs = append(installArgs, "--no-build-isolation")
-	} else {
-		s.Log.Info("Using the build isolation flag")
 	}
 
 	// Remove lines from requirements.txt that begin with -i
diff --git a/src/python/supply/supply_test.go b/src/python/supply/supply_test.go
@@ -540,7 +540,7 @@ cffi==0.9.2
 			})
 
 			It("installs the vendor directory", func() {
-				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "-r", filepath.Join(buildDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", "--no-build-isolation", fmt.Sprintf("--find-links=file://%s/vendor", buildDir))
+				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "-r", filepath.Join(buildDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", fmt.Sprintf("--find-links=file://%s/vendor", buildDir), "--no-build-isolation")
 				Expect(supplier.RunPipVendored()).To(Succeed())
 			})
 		})
@@ -549,7 +549,7 @@ cffi==0.9.2
 			BeforeEach(func() {
 				Expect(ioutil.WriteFile(filepath.Join(buildDir, "requirements.txt"), []byte{}, 0644)).To(Succeed())
 				Expect(os.Mkdir(filepath.Join(buildDir, "vendor"), 0755)).To(Succeed())
-				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "-r", filepath.Join(buildDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", "--no-build-isolation", fmt.Sprintf("--find-links=file://%s/vendor", buildDir)).Return(fmt.Errorf("exit 28"))
+				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "-r", filepath.Join(buildDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", fmt.Sprintf("--find-links=file://%s/vendor", buildDir), "--no-build-isolation").Return(fmt.Errorf("exit 28"))
 				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "-r", filepath.Join(buildDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir)).Return(fmt.Errorf("exit 28"))
 			})
 

Original file line number	Diff line number	Diff line change
`@@ -638,10 +638,8 @@ func (s *Supplier) RunPipVendored() error {`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`if hasBuildOptions() {`
`641`		`- s.Log.Info("Using the pip no build isolation flag")`
	`641`	`+ s.Log.Info("Using the pip --no-build-isolation flag since it is available")`
`642`	`642`	`installArgs = append(installArgs, "--no-build-isolation")`
`643`		`- } else {`
`644`		`- s.Log.Info("Using the build isolation flag")`
`645`	`643`	`}`
`646`	`644`
`647`	`645`	`// Remove lines from requirements.txt that begin with -i`