From 288c5f4c57d97ba5dbc6e52a0846353e9641a6e0 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Mon, 1 Dec 2014 00:09:46 +0100
Subject: [PATCH] Always use tarball, minor fixes to test

---
 tests/integration/manifests/base.yml  | 1 +
 tests/integration/virtualbox_tests.py | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/integration/manifests/base.yml b/tests/integration/manifests/base.yml
index 849a31a..3480441 100644
--- a/tests/integration/manifests/base.yml
+++ b/tests/integration/manifests/base.yml
@@ -2,6 +2,7 @@
 provider: {}
 bootstrapper:
   workspace: /target
+  tarball: true
 image:
   name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d}
   description: Debian {system.release} {system.architecture}
diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py
index adcc190..84f990b 100644
--- a/tests/integration/virtualbox_tests.py
+++ b/tests/integration/virtualbox_tests.py
@@ -26,12 +26,14 @@ volume:
 
 	bootstrap_info = tools.bootstrap(manifest, build_server)
 
-	if isinstance(build_server, tools.build_servers.LocalBuildServer):
+	from bootstrapvz.remote.build_servers import LocalBuildServer
+	if isinstance(build_server, LocalBuildServer):
 		image_path = bootstrap_info.volume.image_path
 	else:
 		import tempfile
 		handle, image_path = tempfile.mkstemp()
-		handle.close()
+		import os
+		os.close(handle)
 		build_server.download(bootstrap_info.volume.image_path, image_path)
 		build_server.delete(bootstrap_info.volume.image_path)