[python-django-horizon/el6-icehouse] Updated patches from el6-icehouse-patches

[Matthias Runge]

commit 08a7fe00947b641aee1904ae1399abd93b10b7b1
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Jul 28 12:56:17 2014 +0200

    Updated patches from el6-icehouse-patches

 ...oken-unit-test-related-to-Change-Password.patch |   41 ++++++++++++++++++++
 python-django-horizon.spec                         |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/0015-Disable-broken-unit-test-related-to-Change-Password.patch b/0015-Disable-broken-unit-test-related-to-Change-Password.patch
new file mode 100644
index 0000000..314ec0c
--- /dev/null
+++ b/0015-Disable-broken-unit-test-related-to-Change-Password.patch
@@ -0,0 +1,41 @@
+From 23c144b1ed37967871083a23d120922c731b6438 Mon Sep 17 00:00:00 2001
+From: Julie Pichon <jpichon at redhat.com>
+Date: Mon, 23 Jun 2014 11:58:09 +0100
+Subject: [PATCH] Disable broken unit test (related to "Change Password")
+
+The new django_openstack_auth 1.1.6 library surfaced a defect in this
+test, whereby the test client does not properly log out the user. This
+only affects the test, the functionality otherwise works fine.
+
+This temporarily disables the test in order to repair the gate, while
+waiting to replace it with a new unit test more reduced in scope and/or
+an integration test.
+
+Change-Id: I8779666c053a4835e22038a39a530fe5fc84b6a3
+Partial-Bug: #1333144
+(cherry picked from commit 5455b8f6f595633513b6521449ebc1985d5b9070)
+---
+ openstack_dashboard/dashboards/settings/password/tests.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/openstack_dashboard/dashboards/settings/password/tests.py b/openstack_dashboard/dashboards/settings/password/tests.py
+index 6ed948d..d022d6d 100644
+--- a/openstack_dashboard/dashboards/settings/password/tests.py
++++ b/openstack_dashboard/dashboards/settings/password/tests.py
+@@ -17,6 +17,7 @@
+ from django.core.urlresolvers import NoReverseMatch  # noqa
+ from django.core.urlresolvers import reverse
+ from django import http
++from django.utils import unittest
+ 
+ from mox import IsA  # noqa
+ 
+@@ -53,6 +54,8 @@ class ChangePasswordTests(test.TestCase):
+ 
+         self.assertFormError(res, "form", None, ['Passwords do not match.'])
+ 
++    # TODO(jpichon): Temporarily disabled, see bug #1333144
++    @unittest.skip("Temporarily disabled, see bug #1333144")
+     @test.create_stubs({api.keystone: ('user_update_own_password', )})
+     def test_change_password_shows_message_on_login_page(self):
+         api.keystone.user_update_own_password(IsA(http.HttpRequest),
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 0e7ea40..906488e 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -37,6 +37,7 @@ Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch
 Patch0012: 0012-Re-enable-offline-compression.patch
 Patch0013: 0013-Fix-issues-with-importing-the-Login-form.patch
 Patch0014: 0014-Fix-multiple-Cross-Site-Scripting-XSS-vulnerabilitie.patch
+Patch0015: 0015-Disable-broken-unit-test-related-to-Change-Password.patch
 
 BuildArch:  noarch