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

[Chuck Short]

[James Page (james-page)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-20 12:42:26 +0000
+++ debian/changelog	2013-03-22 15:59:24 +0000
@@ -1,3 +1,10 @@
+glance (1:2013.1~rc1-0ubuntu2) raring; urgency=low
+
+  * debian/patches/fix-ubuntu-tests.patch: Add configuration change
+    to allow testsuite to finish on Ubuntu buildds. (LP: #1158247) 
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Mar 2013 10:55:03 -0500
+
 glance (1:2013.1~rc1-0ubuntu1) raring; urgency=low
 
   [ James Page ]
 
=== added file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-03-22 15:59:24 +0000
@@ -0,0 +1,12 @@
+diff -Naurp glance-2013.1.rc1.orig/glance/tests/functional/test_server_monkey_patch.py glance-2013.1.rc1/glance/tests/functional/test_server_monkey_patch.py
+--- glance-2013.1.rc1.orig/glance/tests/functional/test_server_monkey_patch.py	2013-03-20 04:02:43.000000000 -0500
++++ glance-2013.1.rc1/glance/tests/functional/test_server_monkey_patch.py	2013-03-22 10:53:53.623990910 -0500
+@@ -74,7 +74,7 @@ class TestClientServerInteractions(funct
+         self.port_one = utils.get_unused_port()
+         server_one = wsgi.Server()
+         self.config(bind_host='127.0.0.1')
+-        self.config(workers=1)
++        self.config(workers=0)
+         self.sleep_time = 1
+         server_one.start(MockServerSleepTestApp("one",
+                                                 self.sleep_time)(),
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-23 16:32:21 +0000
+++ debian/patches/series	2013-03-22 15:59:24 +0000
@@ -1,3 +1,4 @@
 sql_conn.patch
 disable-network-for-docs.patch
 fix-nosetests-path.patch
+fix-ubuntu-tests.patch