Merge pull request #3503 from ActiveState/mitchell/dx-3075

Fixed failing integration tests.
ActiveState · Sep 24, 2024 · 44d3237 · 44d3237
2 parents 5515ef4 + ff7c569
commit 44d3237
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/test/integration/pull_int_test.go b/test/integration/pull_int_test.go
@@ -90,7 +90,7 @@ func (suite *PullIntegrationTestSuite) TestMergeBuildScript() {
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("install", "shared/zlib")
-	cp.Expect("Package added", e2e.RuntimeSourcingTimeoutOpt)
+	cp.Expect("Added", e2e.RuntimeSourcingTimeoutOpt)
 	cp.ExpectExitCode(0)
 
 	proj, err := project.FromPath(ts.Dirs.Work)

diff --git a/test/integration/push_int_test.go b/test/integration/push_int_test.go
@@ -87,10 +87,10 @@ func (suite *PushIntegrationTestSuite) TestInitAndPush() {
 	cp = ts.Spawn("install", suite.extraPackage)
 	switch runtime.GOOS {
 	case "darwin":
-		cp.ExpectRe("added|being built", termtest.OptExpectTimeout(60*time.Second)) // while cold storage is off
+		cp.ExpectRe("Added|being built", termtest.OptExpectTimeout(60*time.Second)) // while cold storage is off
 		cp.Wait()
 	default:
-		cp.Expect("added", termtest.OptExpectTimeout(60*time.Second))
+		cp.Expect("Added", termtest.OptExpectTimeout(60*time.Second))
 		cp.ExpectExitCode(0)
 	}
 
@@ -129,10 +129,10 @@ func (suite *PushIntegrationTestSuite) TestPush_NoPermission_NewProject() {
 	cp = ts.Spawn("install", suite.extraPackage)
 	switch runtime.GOOS {
 	case "darwin":
-		cp.ExpectRe("added|being built", termtest.OptExpectTimeout(60*time.Second)) // while cold storage is off
+		cp.ExpectRe("Added|being built", termtest.OptExpectTimeout(60*time.Second)) // while cold storage is off
 		cp.Wait()
 	default:
-		cp.Expect("added", termtest.OptExpectTimeout(60*time.Second))
+		cp.Expect("Added", termtest.OptExpectTimeout(60*time.Second))
 		cp.ExpectExitCode(0)
 	}
 
@@ -192,10 +192,10 @@ func (suite *PushIntegrationTestSuite) TestCarlisle() {
 	)
 	switch runtime.GOOS {
 	case "darwin":
-		cp.ExpectRe("added|being built", e2e.RuntimeSourcingTimeoutOpt) // while cold storage is off
+		cp.ExpectRe("Added|being built", e2e.RuntimeSourcingTimeoutOpt) // while cold storage is off
 		cp.Wait()
 	default:
-		cp.Expect("added", e2e.RuntimeSourcingTimeoutOpt)
+		cp.Expect("Added", e2e.RuntimeSourcingTimeoutOpt)
 		cp.ExpectExitCode(0)
 	}
 

diff --git a/test/integration/reset_int_test.go b/test/integration/reset_int_test.go
@@ -30,7 +30,7 @@ func (suite *ResetIntegrationTestSuite) TestReset() {
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("install", "shared/zlib")
-	cp.Expect("Package added")
+	cp.Expect("Added")
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("history")

diff --git a/test/integration/revert_int_test.go b/test/integration/revert_int_test.go
@@ -65,7 +65,7 @@ func (suite *RevertIntegrationTestSuite) TestRevertRemote() {
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("install", "requests")
-	cp.Expect("Added: requests")
+	cp.Expect("Added: language/python/requests")
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("revert", "REMOTE", "--non-interactive")