vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cmd: switch to --connect and --listen flags

Browse source 
Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-10-10 20:57:17 +11:00
parent 316e85f0b4
commit 3f48986ea0
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/helpers.bash
View file

@ -36,7 +36,7 @@ function ocid() {
# Run ocic using the binary specified by $OCID_BINARY.
function ocic() {
"$OCIC_BINARY" --socket "$OCID_SOCKET" "$@"
"$OCIC_BINARY" --connect "$OCID_SOCKET" "$@"
}
# Communicate with Docker on the host machine.
@ -72,7 +72,7 @@ function wait_until_reachable() {
# Start ocid.
function start_ocid() {
"$OCID_BINARY" --conmon "$CONMON_BINARY" --pause "$PAUSE_BINARY" --debug --socket "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
"$OCID_BINARY" --conmon "$CONMON_BINARY" --pause "$PAUSE_BINARY" --debug --listen "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
wait_until_reachable
}