Merge lp:~zulcss/neutron/ftbfs-jan15 into lp:~ubuntu-server-dev/neutron/icehouse

[Chuck Short]

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-19 15:00:13 +0000
+++ debian/changelog	2014-01-15 18:54:29 +0000
@@ -1,5 +1,6 @@
 neutron (1:2014.1~b1+master-0ubuntu1) UNRELEASED; urgency=low
 
+  [ James Page ]
   * Switch to using Modular Layer 2 plugin by default:
     - d/control,neutron-plugin-ml2.install: Add ML2 plugin package
       (LP: #1243147).
@@ -30,6 +31,12 @@
   * d/control,d/p/remove-jsonrpclib.patch: Add BD on python-jsonrpclib and drop
     patch that excludes it from requirements.txt.
 
+  [ Chuck Short ]
+  * debian/rules: Run testr directly
+  * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3
+    compat.
+  * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config.
+
  -- James Page <[e-mail]>  Tue, 10 Dec 2013 12:28:48 +0000
 
 neutron (1:2014.1~b1-0ubuntu1) trusty; urgency=low
 
=== modified file 'debian/neutron-plugin-nicira.install'
--- debian/neutron-plugin-nicira.install	2013-07-15 17:45:17 +0000
+++ debian/neutron-plugin-nicira.install	2014-01-15 18:54:29 +0000
@@ -1,2 +1,3 @@
 etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira
 usr/bin/neutron-check-nvp-config usr/bin
+usr/bin/neutron-check-nsx-config usr/bin
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-19 15:00:13 +0000
+++ debian/patches/series	2014-01-15 18:54:29 +0000
@@ -4,3 +4,4 @@
 requirements.patch
 disable-failing-metaplugin-tests.patch
 disable-failing-cisco-test.patch
+sql-alchemy-0.8.3-compat.patch
 
=== added file 'debian/patches/sql-alchemy-0.8.3-compat.patch'
--- debian/patches/sql-alchemy-0.8.3-compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sql-alchemy-0.8.3-compat.patch	2014-01-15 18:54:29 +0000
@@ -0,0 +1,67 @@
+Description: Fix sqlalchemy 0.8.3 compat
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff --git a/neutron/openstack/common/db/sqlalchemy/session.py b/neutron/openstack/common/db/sqlalchemy/session.py
+index 3279343..113424c 100644
+--- a/neutron/openstack/common/db/sqlalchemy/session.py
++++ b/neutron/openstack/common/db/sqlalchemy/session.py
+@@ -441,6 +441,11 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # 1 column - (IntegrityError) column c1 is not unique
+ # N columns - (IntegrityError) column c1, c2, ..., N are not unique
+ #
++# sqlite since 3.7.16:
++# 1 column - (IntegrityError) UNIQUE constraint failed: k1
++#
++# N columns - (IntegrityError) UNIQUE constraint failed: k1, k2
++#
+ # postgres:
+ # 1 column - (IntegrityError) duplicate key value violates unique
+ #               constraint "users_c1_key"
+@@ -453,9 +458,10 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # N columns - (IntegrityError) (1062, "Duplicate entry 'values joined
+ #               with -' for key 'name_of_our_constraint'")
+ _DUP_KEY_RE_DB = {
+-    "sqlite": re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
+-    "postgresql": re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),
+-    "mysql": re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$")
++    "sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
++              re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")),
++    "postgresql": (re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),),
++    "mysql": (re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$"),)
+ }
+ 
+ 
+@@ -480,10 +486,14 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name):
+     if engine_name not in ["mysql", "sqlite", "postgresql"]:
+         return
+ 
+-    m = _DUP_KEY_RE_DB[engine_name].match(integrity_error.message)
+-    if not m:
++    for pattern in _DUP_KEY_RE_DB[engine_name]:
++        match = pattern.match(integrity_error.message)
++        if match:
++            break
++    else:
+         return
+-    columns = m.group(1)
++
++    columns = match.group(1)
+ 
+     if engine_name == "sqlite":
+         columns = columns.strip().split(", ")
+diff --git a/run_tests.sh b/run_tests.sh
+index cc17124..06934e9 100755
+--- a/run_tests.sh
++++ b/run_tests.sh
+@@ -162,7 +162,7 @@ function run_pep8 {
+ }
+ 
+ 
+-TESTRTESTS="python setup.py testr"
++TESTRTESTS="python -m neutron.openstack.common.lockutils python setup.py testr"
+ 
+ if [ $never_venv -eq 0 ]
+ then
+-- 
+1.8.5.2
+
 
=== modified file 'debian/rules'
--- debian/rules	2013-12-19 14:08:21 +0000
+++ debian/rules	2014-01-15 18:54:29 +0000
@@ -25,7 +25,7 @@
 	# with a core_plugin being set.
 	patch -p1 -R < debian/patches/fix-quantum-configuration.patch
 	# Set a reasonable level of concurrency
-	./run_tests.sh -N -P --concurrency=4
+	python -m neutron.openstack.common.lockutils python setup.py testr
 	# Patch configuration file after testing
 	patch -p1 < debian/patches/fix-quantum-configuration.patch
 endif