Ubuntu
neutron package

Merge ~chris.macnaughton/ubuntu/+source/neutron:bug/1885876 into ~ubuntu-server-dev/ubuntu/+source/neutron:master

  1. Git
  2. lp:~chris.macnaughton/ubuntu/+source/neutron
  3. bug/1885876
  4. Merge into master
Proposed by Chris MacNaughton
Status: Merged
Merge reported by: Corey Bryant
Merged at revision: bbea474299fca9b3789ec285ea7c1adf76c5a8c4
Proposed branch: ~chris.macnaughton/ubuntu/+source/neutron:bug/1885876
Merge into: ~ubuntu-server-dev/ubuntu/+source/neutron:master
Diff against target: 40 lines (+8/-7)
3 files modified
debian/changelog (+7/-0)
debian/rules (+1/-2)
dev/null (+0/-5)
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+390280@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Merged, thanks. We'll pick it up on the next upload.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ba41b90..48de95c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+neutron (2:17.0.0~git2020073015.17324fe1cf-0ubuntu3) UNRELEASED; urgency=medium
7+
8+ * d/rules,test-blacklist.txt: Removed. Tests are now passing after latest
9+ snapshot (LP: #1885876).
10+
11+ -- Chris MacNaughton <chris.macnaughton@canonical.com> Fri, 04 Sep 2020 06:21:52 +0000
12+
13 neutron (2:17.0.0~git2020073015.17324fe1cf-0ubuntu2) groovy; urgency=medium
14
15 * d/control: Remove Breaks/Replaces that are older than Focal (LP: #1878419).
16diff --git a/debian/rules b/debian/rules
17index ce5b650..d01d167 100755
18--- a/debian/rules
19+++ b/debian/rules
20@@ -54,8 +54,7 @@ override_dh_auto_clean:
21
22 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
23 override_dh_auto_test:
24- # NOTE: blacklisted tests under https://pad.lv/1885876
25- OS_TEST_TIMEOUT=180 OS_LOG_CAPTURE=true OS_STDOUT_CAPTURE=true OS_STDERR_CAPTURE=true pkgos-dh_auto_test --no-py2 --blacklist-file $(CURDIR)/debian/test-blacklist.txt
26+ OS_TEST_TIMEOUT=180 OS_LOG_CAPTURE=true OS_STDOUT_CAPTURE=true OS_STDERR_CAPTURE=true pkgos-dh_auto_test --no-py2
27 endif
28
29 override_dh_python3:
30diff --git a/debian/test-blacklist.txt b/debian/test-blacklist.txt
31deleted file mode 100644
32index 7247880..0000000
33--- a/debian/test-blacklist.txt
34+++ /dev/null
35@@ -1,5 +0,0 @@
36-neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_tunnel.TunnelTestOSKen.test_daemon_loop
37-neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_tunnel.TunnelTestWithMTUOSKen.test_daemon_loop
38-neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_tunnel.TunnelTestUseVethIntercoOSKen.test_daemon_loop
39-neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_neutron_agent.TestOvsNeutronAgentOSKen.test_fdb_add_flows
40-neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_neutron_agent.TestOvsNeutronAgentOSKen.test_fdb_del_flows

Subscribers

People subscribed via source and target branches