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

[Chuck Short]

Fixes FTBFS and newer upstream snapshot.

[Adam Gandelman (gandelman-a)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 15:32:08 +0000
+++ debian/changelog	2012-11-29 18:07:26 +0000
@@ -1,3 +1,11 @@
+nova (2013.1~g2~20121129.17379-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/patches/ubuntu-show-tests.patch: Dropped no longer needed.
+  * debian/rules: Run nosetests running in verbose.
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 10:56:31 -0600
+
 nova (2013.1~g1-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-20 15:45:24 +0000
+++ debian/patches/series	2012-11-29 18:07:26 +0000
@@ -4,4 +4,3 @@
 fix-docs-build-without-network.patch
 avoid_setuptools_git_dependency.patch
 fix-libvirt-tests.patch
-ubuntu-show-tests.patch

=== removed file 'debian/patches/ubuntu-show-tests.patch'
--- debian/patches/ubuntu-show-tests.patch	2012-11-08 14:10:12 +0000
+++ debian/patches/ubuntu-show-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Display the tests on the console as well in the log file.
-Author: Chuck Short <[e-mail]>
-Forwarded: Yes
-diff -Naurp nova-2013.1.orig/run_tests.sh nova-2013.1/run_tests.sh
---- nova-2013.1.orig/run_tests.sh	2012-11-07 12:06:53.000000000 -0600
-+++ nova-2013.1/run_tests.sh	2012-11-08 08:06:11.797024712 -0600
-@@ -88,7 +88,7 @@ function run_tests {
-   # Cleanup *pyc
-   ${wrapper} find . -type f -name "*.pyc" -delete
-   # Just run the test suites in current environment
--  ${wrapper} $NOSETESTS | tee nosetests.log
-+  ${wrapper} $NOSETESTS 2>&1 | tee nosetests.log
-   # If we get some short import error right away, print the error log directly
-   RESULT=$?
-   if [ "$RESULT" -ne "0" ];

=== modified file 'debian/rules'
--- debian/rules	2012-11-12 16:51:21 +0000
+++ debian/rules	2012-11-29 18:07:26 +0000
@@ -65,7 +65,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P
+	./run_tests.sh -N -P -v
 endif
 
 override_dh_installinit: