Add fix-oslo.utils-last-vers-compat.patch, useful until ~b2.

Rewritten-From: a1a7683b426b097a621f72838eb776f0a9b8550f

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 3bf689941d97da807496a103818aa17dc7c44808..200bf4d5678505a7007fd7b0c9460c81309f2d13 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,6 +1,7 @@
 horizon (3:10.0.0~b1-3) UNRELEASED; urgency=medium
 
   * Updated Danish translation of debconf templates (Closes: #830639).
+  * Add fix-oslo.utils-last-vers-compat.patch, useful until ~b2.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jul 2016 14:24:50 +0200
 

diff --git a/xenial/debian/patches/fix-oslo.utils-last-vers-compat.patch b/xenial/debian/patches/fix-oslo.utils-last-vers-compat.patch
new file mode 100644 (file)
index 0000000..ceb4210
--- /dev/null
+++ b/xenial/debian/patches/fix-oslo.utils-last-vers-compat.patch
@@ -0,0 +1,28 @@
+Description: Fix oslo.utils last version compatibility
+ Horizon is checking against port 0, which is now valid in oslo.utils.
+ This patch removes the wrong tests.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2016-07-12
+
+--- horizon-10.0.0~b1.orig/horizon/test/tests/utils.py
++++ horizon-10.0.0~b1/horizon/test/tests/utils.py
+@@ -196,7 +196,7 @@ class ValidatorsTests(test.TestCase):
+ 
+     def test_port_validator(self):
+         VALID_PORTS = (1, 65535)
+-        INVALID_PORTS = (-1, 0, 65536)
++        INVALID_PORTS = (-1, 65536)
+ 
+         for port in VALID_PORTS:
+             self.assertIsNone(validators.validate_port_range(port))
+@@ -222,8 +222,7 @@ class ValidatorsTests(test.TestCase):
+         VALID_RANGE = ('1:65535',
+                        '1:1')
+         INVALID_RANGE = ('22:22:22:22',
+-                         '1:-1',
+-                         '0:65535')
++                         '1:-1')
+ 
+         test_call = validators.validate_port_or_colon_separated_port_range
+         for prange in VALID_RANGE:

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 9934670dffaecffe4cc01ac3af8488e03ac6ab27..6cc10f0e822a7bfd9871e1bba72b36cdeb07a73a 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 CVE-2016-4428_Escape_angularjs_templating_in_unsafe_HTML.patch
+fix-oslo.utils-last-vers-compat.patch