[DRE-commits] [vagrant-libvirt] 04/04: autopkgtest improvements

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository vagrant-libvirt.

commit 617e0a74cec16907ac42808f3be786e7c0349805
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 25 22:57:52 2016 -0200

    autopkgtest improvements
---
 debian/changelog     |  3 +++
 debian/tests/basics  | 11 +++++++++--
 debian/tests/control |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98b5e87..db07805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ vagrant-libvirt (0.0.36.git20161125.a894dc0-1) unstable; urgency=medium
   * New upstream snapshot. Includes fix for bringing up VMs with a recent
     libvirt (https://github.com/vagrant-libvirt/vagrant-libvirt/pull/678)
   * debian/copyright: update link to homepage for Source: field
+  * autopkgtest improvements:
+    - remove breaks-testbed restriction, as it is not really the case
+    - make sure the VM is destroyed at the end even if `vagrant up` fails
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 25 Nov 2016 22:45:21 -0200
 
diff --git a/debian/tests/basics b/debian/tests/basics
index bb75499..3ba9d37 100755
--- a/debian/tests/basics
+++ b/debian/tests/basics
@@ -21,8 +21,15 @@ if ! (vagrant box list | grep "$box.*$VAGRANT_DEFAULT_PROVIDER"); then
 fi
 
 cd $ADTTMP
+mkdir testvm
+cd testvm
+
+trap cleanup INT TERM EXIT
+cleanup() {
+  vagrant halt
+  vagrant destroy --force
+}
+
 vagrant init $box
 vagrant up --no-provision
 vagrant ssh -- cat /etc/debian_version
-vagrant halt
-vagrant destroy --force
diff --git a/debian/tests/control b/debian/tests/control
index 7aaa036..049e419 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: basics
 Depends: vagrant, libvirt-daemon-system, @, distro-info
-Restrictions: needs-root, needs-recommends, breaks-testbed, isolation-machine
+Restrictions: needs-root, needs-recommends, isolation-machine

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git