Merge pull request #1127 from Letty5411/0413

test: add lxcfs binary check
AliyunContainerService · Apr 17, 2018 · 9fff714 · 9fff714
2 parents 9ed2a9a + 86ddb2c
commit 9fff714
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/test/cli_run_test.go b/test/cli_run_test.go
@@ -183,6 +183,8 @@ func (suite *PouchRunSuite) TestRunInWrongWay(c *check.C) {
 
 // TestRunEnableLxcfs is to verify run container with lxcfs.
 func (suite *PouchRunSuite) TestRunEnableLxcfs(c *check.C) {
+	// TODO: also check if the pouchd started with lxcfs option
+	SkipIfFalse(c, environment.IsLxcfsEnabled)
 	name := "test-run-lxcfs"
 
 	command.PouchRun("run", "-d", "--name", name, "-m", "512M", "--enableLxcfs=true",

diff --git a/test/environment/env.go b/test/environment/env.go
@@ -138,3 +138,18 @@ func IsGrpquota() bool {
 	return IsDiskQuota() &&
 		(icmd.RunCommand("mount", "|grep grpquota").ExitCode == 0)
 }
+
+// IsLxcfsEnabled checks if the lxcfs is installed and service is enabled.
+func IsLxcfsEnabled() bool {
+	if icmd.RunCommand("which", "lxcfs").ExitCode != 0 {
+		return false
+	}
+	if icmd.RunCommand("pgrep", "lxcfs").ExitCode != 0 {
+		return false
+	}
+	cmd := "ps -ef |grep pouchd |grep \"enable\\-lxcfs\""
+	if icmd.RunCommand("sh", "-c", cmd).ExitCode != 0 {
+		return false
+	}
+	return true
+}