Merge lp:~gandelman-a/ironic/test_concurrency into lp:~ubuntu-server-dev/ironic/icehouse

[Adam Gandelman]

Set test concurrency to 1 to avoid a possible deadlock when running concurrent tests. https://bugs.launchpad.net/ironic/+bug/1300420

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-01 23:07:38 +0000
+++ debian/changelog	2014-04-03 01:39:23 +0000
@@ -8,7 +8,7 @@
     sample config, causing both daemons to log to respective files there.
   * debian/{rules, ironic-common.install}: Install ironic.conf.sample
     as /etc/ironic/ironic.conf.
-  * Fail build if test suite fails.
+  * Fail build if test suite fails, limit testing concurrency to 1.
   * debian/control: Add missing alembic, python-lockfile dependencies.
 
  -- Adam Gandelman <[e-mail]>  Tue, 01 Apr 2014 12:55:01 -0700
 
=== modified file 'debian/rules'
--- debian/rules	2014-04-01 22:55:45 +0000
+++ debian/rules	2014-04-03 01:39:23 +0000
@@ -7,7 +7,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && testr run
+	testr init && testr run --concurrency=1
 endif
 
 override_dh_install: