From 347d034d4688a8949781303eae5534252840c779 Mon Sep 17 00:00:00 2001
From: Steve Heyman <steve.heyman@rackspace.com>
Date: Fri, 27 Feb 2015 14:39:32 -0600
Subject: [PATCH] Update functionaltests to be able to run tox -e functional

Removed extra "nose" pre-req from tox.ini as it is already in
test-requirements.txt, and it causes a "double requirement"
error when running via tox.  Also fixed relative directory
reference to ensure we pick up the right etc/functional_tests.conf
file.

Change-Id: Iffb2891012ff0a4bb13a34bd7f8784104453b150
---
 functionaltests/__init__.py        | 25 +++++++++++++++++++++++++
 functionaltests/client/__init__.py |  4 ++--
 tox.ini                            |  1 -
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/functionaltests/__init__.py b/functionaltests/__init__.py
index e69de29b..ab28f589 100644
--- a/functionaltests/__init__.py
+++ b/functionaltests/__init__.py
@@ -0,0 +1,25 @@
+"""
+Copyright 2015 Rackspace
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+import os
+
+from tempest import config
+
+CONF = config.CONF
+
+# Use local tempest conf if one is available.
+# This usually means we're running tests outside of devstack
+if os.path.exists('./etc/functional_tests.conf'):
+    CONF.set_config_path('./etc/functional_tests.conf')
\ No newline at end of file
diff --git a/functionaltests/client/__init__.py b/functionaltests/client/__init__.py
index 4f8f6b1c..7453542c 100644
--- a/functionaltests/client/__init__.py
+++ b/functionaltests/client/__init__.py
@@ -22,8 +22,8 @@ CONF = config.CONF
 
 # Use local tempest conf if one is available.
 # This usually means we're running tests outside of devstack
-if os.path.exists('../etc/functional_tests.conf'):
-    CONF.set_config_path('../etc/functional_tests.conf')
+if os.path.exists('./etc/functional_tests.conf'):
+    CONF.set_config_path('./etc/functional_tests.conf')
 
 CONF.register_group(cfg.OptGroup('keymanager'))
 CONF.register_opt(cfg.StrOpt('url'), group='keymanager')
diff --git a/tox.ini b/tox.ini
index 640cbbbf..a0b69b4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,6 @@ commands = python setup.py build_sphinx
 # Note: This requires local running instances of Barbican
 deps =
     {[testenv]deps}
-    nose
     git+https://github.com/openstack/tempest.git
 commands = nosetests {toxinidir}/functionaltests --match='{posargs}'