Merge lp:~zulcss/nova/nova-testsuite-fix into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

Currently the package builds succesfully, even when the testsuite fails. This patch modifies the run_test.sh to ftbfs the package when the tests fail.

[Adam Gandelman (gandelman-a)]

This looks okay, but I'm wondering if scraping logs is the best way to detect failures, or if it should rely on the RC from nose, similar to how the other projects currently run_tests: http://paste.ubuntu.com/1408568/

Also, this should really be fixed upstream to avoid another patch.

[Chuck Short (zulcss)]

Well the correct fix would probably use something like tox

Unmerged revisions

506. By Chuck Short on 2012-12-03

debian/patches/fail-tests-check.patch: Don't silently ignore tests
failing when building the package.

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-03 16:03:17 +0000
+++ debian/changelog	2012-12-03 18:36:29 +0000
@@ -3,6 +3,8 @@
   * New upstream release. 
   * debian/patches/ubuntu-show-tests.patch: Dropped no longer needed.
   * debian/rules: Run nosetests running in verbose.
+  * debian/patches/fail-tests-check.patch: Don't silently ignore tests
+    failing when building the package.
 
  -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 10:56:31 -0600
 

=== added file 'debian/patches/fail-tests-check.patch'
--- debian/patches/fail-tests-check.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fail-tests-check.patch	2012-12-03 18:36:29 +0000
@@ -0,0 +1,20 @@
+Description: Really fail the build when the tests fail.
+Author: Chuck Short <[e-mail]>
+Forwarded: no
+diff -Naurp nova-2013.1.orig/run_tests.sh nova-2013.1/run_tests.sh
+--- nova-2013.1.orig/run_tests.sh	2012-11-29 10:48:44.000000000 -0600
++++ nova-2013.1/run_tests.sh	2012-12-03 11:00:01.721425820 -0600
+@@ -119,6 +119,13 @@ function run_tests {
+         return 1
+     fi
+   fi
++ 
++  tests_failed=$(grep FAILED nosetests.log > /dev/null && rc=$? && echo $rc)
++  if [ "$tests_failed" -eq 0 ];
++  then
++       echo "ERROR: Tests failed"
++       return 1
++  fi
+   return $RESULT
+ }
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-29 17:00:21 +0000
+++ debian/patches/series	2012-12-03 18:36:29 +0000
@@ -4,3 +4,4 @@
 fix-docs-build-without-network.patch
 avoid_setuptools_git_dependency.patch
 fix-libvirt-tests.patch
+fail-tests-check.patch