Fix the tests

vanschelven · arjun024 · commit 70bd7f607b91 · 2022-12-16T10:04:43.000-05:00
there is a small assymmetry between RunPipVendored and RunPipUnvendored's errror
messages because the latter prepends 'could not run pip'; this became apparant
in the tests because RunPipVendored no longer calls RunPipUnvendored.

We've simply harmonized on 'could not run pip' and removed a call to pip from the tests
(we no longer do that)
diff --git a/src/python/supply/supply.go b/src/python/supply/supply.go
@@ -704,7 +704,7 @@ func (s *Supplier) RunPipVendored() error {
 
 	if err := s.runPipInstall(installArgs...); err != nil {
         s.Log.Info("Running pip install failed. You need to include all dependencies in the vendor directory.")
-        return err
+        return fmt.Errorf("could not run pip: %v", err)
 	}
 
 	return s.Stager.LinkDirectoryInDepDir(filepath.Join(s.Stager.DepDir(), "python", "bin"), "bin")
diff --git a/src/python/supply/supply_test.go b/src/python/supply/supply_test.go
@@ -631,7 +631,6 @@ MarkupSafe==2.0.1
 				Expect(os.Mkdir(filepath.Join(buildDir, "vendor"), 0755)).To(Succeed())
 				mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "--no-build-isolation", "-h").Return(nil)
 				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), "--disable-pip-version-check", "--no-warn-script-location", "--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), "--disable-pip-version-check", "--no-warn-script-location").Return(fmt.Errorf("exit 28"))
 			})
 
 			const proTip = "Running pip install failed. You need to include all dependencies in the vendor directory."

Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ func (s *Supplier) RunPipVendored() error {`
`704`	`704`
`705`	`705`	`if err := s.runPipInstall(installArgs...); err != nil {`
`706`	`706`	`s.Log.Info("Running pip install failed. You need to include all dependencies in the vendor directory.")`
`707`		`- return err`
	`707`	`+ return fmt.Errorf("could not run pip: %v", err)`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`return s.Stager.LinkDirectoryInDepDir(filepath.Join(s.Stager.DepDir(), "python", "bin"), "bin")`