github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1219 from Random-Liu/rename-test-containerd-bin

Browse Source 
Rename the test binary to containerd-test.
This commit is contained in:
Lantao Liu 2019-08-05 10:11:07 -07:00 committed by GitHub
commit b213648c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/test-integration.sh
View File

@ -36,7 +36,8 @@ test_setup ${REPORT_DIR}
sudo PATH=${PATH} ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \ sudo PATH=${PATH} ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \
--cri-endpoint=${CONTAINERD_SOCK} \ --cri-endpoint=${CONTAINERD_SOCK} \
--cri-root=${CRI_ROOT} \ --cri-root=${CRI_ROOT} \
--runtime-handler=${RUNTIME} --runtime-handler=${RUNTIME} \
--containerd-bin=${CONTAINERD_BIN}
test_exit_code=$? test_exit_code=$?

7
hack/test-utils.sh
View File

@ -32,6 +32,8 @@ CONTAINERD_ROOT=${CONTAINERD_ROOT:-"/var/lib/containerd${CONTAINERD_TEST_SUFFIX}
CONTAINERD_STATE=${CONTAINERD_STATE:-"/run/containerd${CONTAINERD_TEST_SUFFIX}"} CONTAINERD_STATE=${CONTAINERD_STATE:-"/run/containerd${CONTAINERD_TEST_SUFFIX}"}
# The containerd socket address. # The containerd socket address.
CONTAINERD_SOCK=${CONTAINERD_SOCK:-unix://${CONTAINERD_STATE}/containerd.sock} CONTAINERD_SOCK=${CONTAINERD_SOCK:-unix://${CONTAINERD_STATE}/containerd.sock}
# The containerd binary name.
CONTAINERD_BIN=${CONTAINERD_BIN:-"containerd${CONTAINERD_TEST_SUFFIX}"}
if [ -f "${CONTAINERD_CONFIG_FILE}" ]; then if [ -f "${CONTAINERD_CONFIG_FILE}" ]; then
CONTAINERD_FLAGS+="--config ${CONTAINERD_CONFIG_FILE} " CONTAINERD_FLAGS+="--config ${CONTAINERD_CONFIG_FILE} "
fi fi
@ -49,10 +51,13 @@ test_setup() {
echo "containerd is not built" echo "containerd is not built"
exit 1 exit 1
fi fi
# rename the test containerd binary, so that we can easily
# distinguish it.
cp ${ROOT}/_output/containerd ${ROOT}/_output/${CONTAINERD_BIN}
set -m set -m
# Create containerd in a different process group # Create containerd in a different process group
# so that we can easily clean them up. # so that we can easily clean them up.
keepalive "sudo PATH=${PATH} ${ROOT}/_output/containerd ${CONTAINERD_FLAGS}" \ keepalive "sudo PATH=${PATH} ${ROOT}/_output/${CONTAINERD_BIN} ${CONTAINERD_FLAGS}" \
${RESTART_WAIT_PERIOD} &> ${report_dir}/containerd.log & ${RESTART_WAIT_PERIOD} &> ${report_dir}/containerd.log &
pid=$! pid=$!
set +m set +m

5
integration/test_utils.go
View File

@ -60,6 +60,7 @@ var (
var criEndpoint = flag.String("cri-endpoint", "unix:///run/containerd/containerd.sock", "The endpoint of cri plugin.") 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 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 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() { func init() {
flag.Parse() flag.Parse()
@ -395,12 +396,12 @@ func SandboxInfo(id string) (*runtime.PodSandboxStatus, *server.SandboxInfo, err
} }
func RestartContainerd(t *testing.T) { 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 // Use assert so that the 3rd wait always runs, this makes sure
// containerd is running before this function returns. // containerd is running before this function returns.
assert.NoError(t, Eventually(func() (bool, error) { assert.NoError(t, Eventually(func() (bool, error) {
pid, err := PidOf("containerd") pid, err := PidOf(*containerdBin)
if err != nil { if err != nil {
return false, err return false, err
} }