Merge pull request #1616 from r2d4/remove-systemd-test
Remove systemd integration testpull/1611/head
commit
95215d04c2
|
@ -19,7 +19,6 @@ limitations under the License.
|
||||||
package integration
|
package integration
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"runtime"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
@ -46,10 +45,6 @@ func TestFunctional(t *testing.T) {
|
||||||
if !strings.Contains(*args, "--vm-driver=none") {
|
if !strings.Contains(*args, "--vm-driver=none") {
|
||||||
t.Run("EnvVars", testClusterEnv)
|
t.Run("EnvVars", testClusterEnv)
|
||||||
t.Run("SSH", testClusterSSH)
|
t.Run("SSH", testClusterSSH)
|
||||||
if runtime.GOOS != "windows" {
|
|
||||||
t.Run("Systemd", testVMSystemd)
|
|
||||||
|
|
||||||
}
|
|
||||||
// t.Run("Mounting", testMounting)
|
// t.Run("Mounting", testMounting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
// +build integration
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package integration
|
|
||||||
|
|
||||||
import (
|
|
||||||
"runtime"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"k8s.io/minikube/test/integration/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
func testVMSystemd(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
t.Skip("skipping test in windows as it doesn't exit properly")
|
|
||||||
}
|
|
||||||
|
|
||||||
minikubeRunner := util.MinikubeRunner{
|
|
||||||
Args: *args,
|
|
||||||
BinaryPath: *binaryPath,
|
|
||||||
T: t}
|
|
||||||
|
|
||||||
expectedStr := "0 loaded units listed"
|
|
||||||
sshCmdOutput := minikubeRunner.RunCommand("ssh -- systemctl --state=failed --all", true)
|
|
||||||
if !strings.Contains(sshCmdOutput, expectedStr) {
|
|
||||||
t.Logf("Expected no systemd units to be failed got:\n %s", sshCmdOutput)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue