Ironic

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

  1. test_concurrency
  2. Merge into icehouse
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 13
Proposed branch: lp:~gandelman-a/ironic/test_concurrency
Merge into: lp:~ubuntu-server-dev/ironic/icehouse
Diff against target: 25 lines (+2/-2)
2 files modified
debian/changelog (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/ironic/test_concurrency
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+213955@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-01 23:07:38 +0000
3+++ debian/changelog 2014-04-03 01:39:23 +0000
4@@ -8,7 +8,7 @@
5 sample config, causing both daemons to log to respective files there.
6 * debian/{rules, ironic-common.install}: Install ironic.conf.sample
7 as /etc/ironic/ironic.conf.
8- * Fail build if test suite fails.
9+ * Fail build if test suite fails, limit testing concurrency to 1.
10 * debian/control: Add missing alembic, python-lockfile dependencies.
11
12 -- Adam Gandelman <adamg@ubuntu.com> Tue, 01 Apr 2014 12:55:01 -0700
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-04-01 22:55:45 +0000
16+++ debian/rules 2014-04-03 01:39:23 +0000
17@@ -7,7 +7,7 @@
18
19 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
20 override_dh_auto_test:
21- testr init && testr run
22+ testr init && testr run --concurrency=1
23 endif
24
25 override_dh_install:

Subscribers

People subscribed via source and target branches