From 4a9f26bf2081f6d3643f4d4e30434024b8724887 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Wed, 22 May 2013 05:50:21 +0000
Subject: [PATCH] Install nose 1.1 from EPEL for RHEL.

 * It's not possible to prevent python-nose (which is not compatible
   with Tempest) from being installed since so many os packages
   dependent on it.
 * This patch installs python-nose1.1 from EPEL and adds a
   /usr/local/bin symlink for nosetests1.1 so that invocations for
   Tempest will work as expected.

Change-Id: I756d1ca5eda127dcdd2efb047c8e14dd344f710d
---
 files/rpms/horizon | 3 +--
 files/rpms/swift   | 3 +--
 stack.sh           | 9 +++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/files/rpms/horizon b/files/rpms/horizon
index d50482ea1d..151e7e21af 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,8 +16,7 @@ python-kombu
 python-migrate
 python-mox
 python-netaddr
-# RHEL6's python-nose is incompatible with Tempest
-python-nose         #dist:f16,f17,f18
+python-nose
 python-paste        #dist:f16,f17,f18
 python-paste-deploy #dist:f16,f17,f18
 python-pep8
diff --git a/files/rpms/swift b/files/rpms/swift
index c626d8e3e0..1b36e34eab 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -7,8 +7,7 @@ python-devel
 python-eventlet
 python-greenlet
 python-netifaces
-# RHEL6's python-nose is incompatible with Tempest
-python-nose         # dist:f16,f17,f18
+python-nose
 python-paste-deploy # dist:f16,f17,f18
 python-setuptools   # dist:f16,f17,f18
 python-simplejson
diff --git a/stack.sh b/stack.sh
index 5dea00097a..16533df6f4 100755
--- a/stack.sh
+++ b/stack.sh
@@ -609,6 +609,15 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
     # transiently, meaning we avoid the issue of it not being cleaned
     # out properly.  Note we do this before the track-depends below.
     pip_install hgtools
+
+    # The version of python-nose in the RHEL6 repo is incompatible
+    # with Tempest.  As a workaround:
+
+    # Install nose 1.1 (Tempest-compatible) from EPEL
+    install_package python-nose1.1
+    # Add a symlink for the new nosetests to allow tox for Tempest to
+    # work unmolested.
+    sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests
 fi
 
 TRACK_DEPENDS=${TRACK_DEPENDS:-False}