From 76d87976d9c48bc1ea8593031b355b60faddfbec Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@virtuozzo.com>
Date: Sat, 10 Jun 2017 02:49:40 +0300
Subject: [PATCH] tests: remove wait_for_container from checkpoint.bats

It isn't required there, all operations what are called are synchronous.

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 tests/integration/checkpoint.bats | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/tests/integration/checkpoint.bats b/tests/integration/checkpoint.bats
index a5ce3d3fa..aaaf7ef58 100644
--- a/tests/integration/checkpoint.bats
+++ b/tests/integration/checkpoint.bats
@@ -21,12 +21,7 @@ function teardown() {
   runc run -d --console-socket $CONSOLE_SOCKET test_busybox
   [ "$status" -eq 0 ]
 
-  # check state
-  wait_for_container 15 1 test_busybox
-
-  runc state test_busybox
-  [ "$status" -eq 0 ]
-  [[ "${output}" == *"running"* ]]
+  testcontainer test_busybox running
 
   for i in `seq 2`; do
 	  # checkpoint the running container
@@ -40,19 +35,12 @@ function teardown() {
 	  [ "$status" -ne 0 ]
 
 	  # restore from checkpoint
-	  (
-	    runc --criu "$CRIU" restore -d --console-socket $CONSOLE_SOCKET test_busybox
-	    [ "$status" -eq 0 ]
-	  ) &
+	  runc --criu "$CRIU" restore -d --console-socket $CONSOLE_SOCKET test_busybox
+	  [ "$status" -eq 0 ]
 
-	  # check state
-	  wait_for_container 15 1 test_busybox
+	  # busybox should be back up and running
+          testcontainer test_busybox running
   done
-
-  # busybox should be back up and running
-  runc state test_busybox
-  [ "$status" -eq 0 ]
-  [[ "${output}" == *"running"* ]]
 }
 
 @test "checkpoint --pre-dump and restore" {