Merge branch version/0-47-0-RC1 to adopt changes from PR #3519

ActiveState · Oct 2, 2024 · 7e715d7 · 7e715d7
2 parents 6d63bf8 + d9a4a86
commit 7e715d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/internal/process/process.go b/internal/process/process.go
@@ -29,14 +29,10 @@ func ActivationPID(cfg Configurable) int32 {
 
 	seen := map[int32]bool{}
 	for pid != 0 && pid != ppid {
-		logging.Debug("Current PID: %d, Parent PID: %d", pid, ppid)
 		pidFileName := ActivationPIDFileName(cfg.ConfigPath(), int(pid))
-		logging.Debug("Looking for activation pid file: %s", pidFileName)
 		if fileutils.FileExists(pidFileName) {
-			logging.Debug("Found activation pid file: %s", pidFileName)
 			return pid
 		}
-		logging.Debug("Activation pid file not found")
 
 		if ppid == 0 {
 			logging.Debug("Parent PID is 0")

diff --git a/test/integration/import_int_test.go b/test/integration/import_int_test.go
@@ -113,7 +113,7 @@ func (suite *ImportIntegrationTestSuite) TestImport() {
 		cp.ExpectExitCode(0)
 
 		cp = ts.Spawn("import", "requirements.txt")
-		cp.Expect("already installed")
+		cp.Expect("no changes")
 		cp.ExpectNotExitCode(0)
 	})