From: S.Çağlar Onur <caglar@10ur.org>
Date: Sat, 19 Oct 2013 04:51:21 +0000 (-0400)
Subject: use snapshot_destroy in tests/snapshot.c and clean up containers after the test run
X-Git-Tag: lxc-1.0.0.alpha3~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b61f6d3442e984a88c093dbdfd20f1d0a82587;p=thirdparty%2Flxc.git

use snapshot_destroy in tests/snapshot.c and clean up containers after the test run

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c
index 8f165486d..1f6d115d8 100644
--- a/src/tests/snapshot.c
+++ b/src/tests/snapshot.c
@@ -118,13 +118,25 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
-	printf("All tests passed\n");
+	if (!c->snapshot_destroy(c, "snap0")) {
+		fprintf(stderr, "%s: %d: failed to destroy snapshot\n", __FILE__, __LINE__);
+		goto err;
+	}
+
+	if (!c->destroy(c)) {
+		fprintf(stderr, "%s: %d: failed to destroy container\n", __FILE__, __LINE__);
+		goto err;
+	}
+
 	lxc_container_put(c);
-	exit(0);
+	try_to_remove();
 
+	printf("All tests passed\n");
+	exit(0);
 err:
 	lxc_container_put(c);
-	fprintf(stderr, "Exiting on error\n");
 	try_to_remove();
+
+	fprintf(stderr, "Exiting on error\n");
 	exit(1);
 }