Fixed TestHostCgroupNS (#2)

testing without github skips after fixing other tests revert Co-authored-by: Tullio Sebastiani <[email protected]>
arcalot · Mar 17, 2023 · 5f74a09 · 5f74a09
1 parent 83fde51
commit 5f74a09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/connector_test.go b/connector_test.go
@@ -307,10 +307,6 @@ func TestPrivateCgroupNs(t *testing.T) {
 }
 
 func TestHostCgroupNs(t *testing.T) {
-	// get the user cgroup ns
-	if tests.IsRunningOnGithub() {
-		t.Skipf("joining host machine cgroup namespace not supported on GitHub actions")
-	}
 	logger := log.NewTestLogger(t)
 	var wg sync.WaitGroup
 

diff --git a/tests/common.go b/tests/common.go
@@ -86,13 +86,12 @@ func GetCommmandCgroupNs(logger log.Logger, command string, args []string) strin
 		if err := cmd2.Run(); err != nil {
 			logger.Errorf(err.Error())
 		}
-		userCgroupNs = strings.Split(stdout.String(), " ")[10]
+		stdoutStr:=stdout.String()
+		regex:=regexp.MustCompile(`.*cgroup:\[(\d+)\]`)
+		userCgroupNs = regex.ReplaceAllString(stdoutStr,"$1")
+		userCgroupNs = strings.TrimSuffix(userCgroupNs, "\n")
 	}()
 	wg.Wait()
-	// removes linux cgroup notation
-	regex := regexp.MustCompile(`cgroup:\[(\d+)\]`)
-	userCgroupNs = regex.ReplaceAllString(userCgroupNs, "$1")
-	userCgroupNs = strings.TrimSuffix(userCgroupNs, "\n")
 	return userCgroupNs
 }