ivanmir
diff --git a/‎src/python/supply/mocks_test.go‎
Lines changed: 14 additions & 0 deletions b/‎src/python/supply/mocks_test.go‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/python/supply/supply.go‎
Lines changed: 4 additions & 4 deletions b/‎src/python/supply/supply.go‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/python/supply/supply_test.go‎
Lines changed: 8 additions & 5 deletions b/‎src/python/supply/supply_test.go‎
Lines changed: 8 additions & 5 deletions
@@ -43,6 +43,7 @@ type Installer interface {
 type Command interface {
 	Execute(string, io.Writer, io.Writer, string, ...string) error
 	Output(dir string, program string, args ...string) (string, error)
+	RunWithOutput(*exec.Cmd) ([]byte, error)
 }
 
 type Supplier struct {
@@ -359,7 +360,7 @@ func (s *Supplier) InstallPipEnv() error {
 			s.Log.Info("Installing %s", dep)
 			out := &bytes.Buffer{}
 			stderr := &bytes.Buffer{}
-			if err := s.Command.Execute(s.Stager.BuildDir(), out, stderr, "pip", "install", dep, "-v", "--exists-action=w", "--no-index", fmt.Sprintf("--find-links=%s", filepath.Join("/tmp", "pipenv"))); err != nil {
+			if err := s.Command.Execute(s.Stager.BuildDir(), out, stderr, "pip", "install", dep, "--exists-action=w", "--no-index", fmt.Sprintf("--find-links=%s", filepath.Join("/tmp", "pipenv"))); err != nil {
 				return fmt.Errorf("Failed to install %s: %v.\nStdout: %v\nStderr: %v", dep, err, out, stderr)
 			}
 		}
@@ -369,8 +370,7 @@ func (s *Supplier) InstallPipEnv() error {
 		cmd := exec.Command("pipenv", "lock", "--requirements")
 		cmd.Dir = s.Stager.BuildDir()
 		cmd.Env = append(os.Environ(), "VIRTUALENV_NEVER_DOWNLOAD=true")
-
-		output, err := cmd.Output()
+		output, err := s.Command.RunWithOutput(cmd)
 		outputString := string(output)
 
 		if err != nil {
@@ -529,7 +529,7 @@ func (s *Supplier) RunPip() error {
 		return fmt.Errorf("Couldn't check vendor existence: %v", err)
 	}
 
-	installArgs := []string{"install", "-r", requirementsPath, "--exists-action=w", "--src=" + filepath.Join(s.Stager.DepDir(), "src")}
+	installArgs := []string{"install", "-r", requirementsPath, "--ignore-installed", "--exists-action=w", "--src=" + filepath.Join(s.Stager.DepDir(), "src")}
 	var originalReqs []byte
 	if vendorExists {
 		installArgs = append(installArgs, "--no-index", "--find-links=file://"+filepath.Join(s.Stager.BuildDir(), "vendor"))
 
@@ -188,7 +188,10 @@ var _ = Describe("Supply", func() {
 		ffiDir := expectInstallFfi()
 		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "setuptools_scm", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
 		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "pytest-runner", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
+		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "parver", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
+		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "invoke", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
 		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "pipenv", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
+		mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "wheel", "--exists-action=w", "--no-index", "--find-links=/tmp/pipenv")
 
 		mockStager.EXPECT().LinkDirectoryInDepDir(filepath.Join(filepath.Join(depDir, "python"), "bin"), "bin")
 		return ffiDir
@@ -216,7 +219,7 @@ var _ = Describe("Supply", func() {
 
 			It("installs pipenv and generates requirements.txt", func() {
 				expectInstallPipEnv()
-				mockCommand.EXPECT().Output(buildDir, "pipenv", "lock", "--requirements").Return("test", nil)
+				mockCommand.EXPECT().RunWithOutput(gomock.Any()).Return([]byte("test"), nil)
 				Expect(supplier.InstallPipEnv()).To(Succeed())
 				requirementsContents, err := ioutil.ReadFile(filepath.Join(depDir, "requirements.txt"))
 				Expect(err).ToNot(HaveOccurred())
@@ -225,7 +228,7 @@ var _ = Describe("Supply", func() {
 
 			It("removes extraneous pipenv lock output", func() {
 				expectInstallPipEnv()
-				mockCommand.EXPECT().Output(buildDir, "pipenv", "lock", "--requirements").Return("Using /tmp/deps/0/bin/python3.6m to create virtualenv…\nline 1\nline 2\n", nil)
+				mockCommand.EXPECT().RunWithOutput(gomock.Any()).Return([]byte("Using /tmp/deps/0/bin/python3.6m to create virtualenv…\nline 1\nline 2\n"), nil)
 				Expect(supplier.InstallPipEnv()).To(Succeed())
 				requirementsContents, err := ioutil.ReadFile(filepath.Join(depDir, "requirements.txt"))
 				Expect(err).ToNot(HaveOccurred())
@@ -358,7 +361,7 @@ var _ = Describe("Supply", func() {
 					Expect(os.MkdirAll(depDir, 0755)).To(Succeed())
 					Expect(ioutil.WriteFile(filepath.Join(buildDir, "Pipfile"), []byte("This is pipfile"), 0644)).To(Succeed())
 					ffiDir = expectInstallPipEnv()
-					mockCommand.EXPECT().Output(buildDir, "pipenv", "lock", "--requirements").Return("test", nil)
+					mockCommand.EXPECT().RunWithOutput(gomock.Any()).Return([]byte("test"), nil)
 
 					// install pipenv
 					Expect(supplier.InstallPipEnv()).To(Succeed())
@@ -526,7 +529,7 @@ cffi==0.9.2
 			BeforeEach(func() {
 				Expect(ioutil.WriteFile(filepath.Join(depDir, "requirements.txt"), []byte{}, 0644)).To(Succeed())
 			})
-			const proTip = "You have a vendor directory, it must contain all of your dependencies."
+			const proTip = "Running pip install failed. You need to include all dependencies in the vendor directory."
 			Context("vendor does not exist", func() {
 				BeforeEach(func() {
 					mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "-r", filepath.Join(depDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir)).Return(fmt.Errorf("exit 28"))
@@ -539,7 +542,7 @@ cffi==0.9.2
 			Context("vendor exists", func() {
 				BeforeEach(func() {
 					Expect(os.Mkdir(filepath.Join(buildDir, "vendor"), 0755)).To(Succeed())
-					mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "-r", filepath.Join(depDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", fmt.Sprintf("--find-links=file://%s/vendor", buildDir)).Return(fmt.Errorf("exit 28"))
+					mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "pip", "install", "-r", filepath.Join(depDir, "requirements.txt"), "--ignore-installed", "--exists-action=w", fmt.Sprintf("--src=%s/src", depDir), "--no-index", fmt.Sprintf("--find-links=file://%s/vendor", buildDir)).Return(fmt.Errorf("exit 28")).Times(2)
 				})
 				It("alerts the user", func() {
 					Expect(supplier.RunPip()).To(MatchError(fmt.Errorf("Couldn't run pip: exit 28")))