[DRE-commits] [ruby-cucumber-rails] 02/04: Shut down spring processes after ADT smoke-test. (Closes: #830101)

[Stefano Rivera]

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

stefanor pushed a commit to branch master
in repository ruby-cucumber-rails.

commit 59d99b6f4bac9117e6967a969608bc1db2954f7d
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sat Jul 23 14:28:02 2016 -0700

    Shut down spring processes after ADT smoke-test. (Closes: #830101)
---
 debian/changelog        |  1 +
 debian/tests/smoke-test | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15095c3..61e6e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ruby-cucumber-rails (1.4.3-1) UNRELEASED; urgency=medium
   * Bump dependencies, following upstream.
   * Bump Standards-Version to 3.9.8, no changes needed.
   * Bump copyright years.
+  * Shut down spring processes after ADT smoke-test. (Closes: #830101)
 
   [ Cédric Boutillier ]
   * Use https:// in Vcs-* fields
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
index c18b696..5846c50 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -1,13 +1,20 @@
 #!/bin/sh
 
+cleanup_adttmp=0
 if [ -z "$ADTTMP" ]; then
   ADTTMP=$(mktemp -d)
-  cleanup() {
-    rm -rf "$ADTTMP"
-  }
-  trap cleanup INT TERM EXIT
+  cleanup_adttmp=1
 fi
 
+cleanup() {
+  set +e
+  spring stop
+  if [ $cleanup_adttmp -gt 0 ]; then
+    rm -rf "$ADTTMP"
+  fi
+}
+trap cleanup INT TERM EXIT
+
 cd $ADTTMP
 
 exec 2>&1

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