Rename the test binary to containerd-test.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2019-08-02 15:43:06 -07:00
parent a99766612f
commit 7665f4ac22
3 changed files with 11 additions and 4 deletions

View File

@@ -60,6 +60,7 @@ var (
var criEndpoint = flag.String("cri-endpoint", "unix:///run/containerd/containerd.sock", "The endpoint of cri plugin.")
var criRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.")
var runtimeHandler = flag.String("runtime-handler", "", "The runtime handler to use in the test.")
var containerdBin = flag.String("containerd-bin", "containerd", "The containerd binary name. The name is used to restart containerd during test.")
func init() {
flag.Parse()
@@ -395,12 +396,12 @@ func SandboxInfo(id string) (*runtime.PodSandboxStatus, *server.SandboxInfo, err
}
func RestartContainerd(t *testing.T) {
require.NoError(t, KillProcess("containerd"))
require.NoError(t, KillProcess(*containerdBin))
// Use assert so that the 3rd wait always runs, this makes sure
// containerd is running before this function returns.
assert.NoError(t, Eventually(func() (bool, error) {
pid, err := PidOf("containerd")
pid, err := PidOf(*containerdBin)
if err != nil {
return false, err
}