From 39c8b1b5e4d029f40d9942fb39c7a11531d1abe2 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 17 Jul 2017 14:57:05 +0100 Subject: [PATCH] Use hello-world instead of redis for getty test It is a far smaller download. Also pin to a specific version to protect against the possibility of the output string changing. The new image name is a bit of a mouthful, put it (and the expected output) into a variable. Signed-off-by: Ian Campbell --- test/cases/040_packages/007_getty-containerd/test.exp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/cases/040_packages/007_getty-containerd/test.exp b/test/cases/040_packages/007_getty-containerd/test.exp index f2709ce33..6b0c96e05 100755 --- a/test/cases/040_packages/007_getty-containerd/test.exp +++ b/test/cases/040_packages/007_getty-containerd/test.exp @@ -3,6 +3,9 @@ spawn linuxkit run test-ctr set pid [exp_pid] set timeout 60 set prompt ":~# " +# Running $image should produce $output +set image "docker.io/library/hello-world@sha256:f3b3b28a45160805bb16542c9531888519430e9e6d6ffc09d72261b0d26ff74f" +set output "Hello from Docker!" expect { timeout { @@ -42,7 +45,7 @@ expect { exit 1 } $prompt { - send "dist pull docker.io/library/redis:alpine\n" + send "dist pull $image\n" } } expect { @@ -53,7 +56,7 @@ expect { } $prompt { puts "SUCCESS dist pull" - send "ctr run -t docker.io/library/redis:alpine test\n" + send "ctr run -t $image test\n" } } expect { @@ -62,7 +65,7 @@ expect { exec kill -9 $pid exit 1 } - "Ready to accept connections" { + $output { puts "SUCCESS ctr run" # Ctrl-C send "\003"