neutron

Merge lp:~zulcss/neutron/conccurency-testr into lp:~ubuntu-server-dev/neutron/icehouse

  1. conccurency-testr
  2. Merge into icehouse
Proposed by Chuck Short
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~zulcss/neutron/conccurency-testr
Merge into: lp:~ubuntu-server-dev/neutron/icehouse
Diff against target: 50 lines (+18/-1)
3 files modified
debian/changelog (+4/-1)
debian/patches/series (+1/-0)
debian/patches/testr_default_concurrency.patch (+13/-0)
To merge this branch: bzr merge lp:~zulcss/neutron/conccurency-testr
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+202327@code.launchpad.net

Description of the change

Set concurrency to 1

To post a comment you must log in.
lp:~zulcss/neutron/conccurency-testr updated
221. By Chuck Short

Set concurrency to 4

Revision history for this message
Martin Pitt (pitti) wrote :

trusty has 1:2014.1.3-0ubuntu1.1 so this seems obsolete.

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-01-15 18:46:48 +0000
3+++ debian/changelog 2014-01-20 16:03:55 +0000
4@@ -1,4 +1,4 @@
5-neutron (1:2014.1~b1+master-0ubuntu1) UNRELEASED; urgency=low
6+neutron (1:2014.1~b2+master-0ubuntu1) UNRELEASED; urgency=low
7
8 [ James Page ]
9 * Switch to using Modular Layer 2 plugin by default:
10@@ -32,10 +32,13 @@
11 patch that excludes it from requirements.txt.
12
13 [ Chuck Short ]
14+ * New usptream release.
15 * debian/rules: Run testr directly
16 * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3
17 compat.
18 * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config.
19+ * debian/patches/testr_default_concurrency.patch: Default test concurrency
20+ to "4" so tests do not timeout on buildds.
21
22 -- James Page <james.page@ubuntu.com> Tue, 10 Dec 2013 12:28:48 +0000
23
24
25=== modified file 'debian/patches/series'
26--- debian/patches/series 2014-01-15 18:46:48 +0000
27+++ debian/patches/series 2014-01-20 16:03:55 +0000
28@@ -5,3 +5,4 @@
29 disable-failing-metaplugin-tests.patch
30 disable-failing-cisco-test.patch
31 sql-alchemy-0.8.3-compat.patch
32+testr_default_concurrency.patch
33
34=== added file 'debian/patches/testr_default_concurrency.patch'
35--- debian/patches/testr_default_concurrency.patch 1970-01-01 00:00:00 +0000
36+++ debian/patches/testr_default_concurrency.patch 2014-01-20 16:03:55 +0000
37@@ -0,0 +1,13 @@
38+Description: Default test concurrency to 4.
39+Author: Chuck Short <zulcss@ubuntu.com>
40+Forwarded: Not-needed
41+diff --git a/.testr.conf b/.testr.conf
42+index b63d965..7963371 100644
43+--- a/.testr.conf
44++++ b/.testr.conf
45+@@ -2,3 +2,4 @@
46+ test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ neutron/tests $LISTOPT $IDOPTION
47+ test_id_option=--load-list $IDFILE
48+ test_list_option=--list
49++test_run_concurrency=echo 4
50+

Subscribers

People subscribed via source and target branches