Fix Tox

We can now run the tests using the `tox` command without needing to have the
Horizon source checked out alongside (the horizon package is a test dependency).

All tests except for Django 1.4 are currently passing.

Change-Id: Id835e14868225a7bc13ff25bc666547a85d085e5
Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 1ced9cff..a8dbf859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 .coverage*
 .noseids
 .DS_STORE
+*.egg/
+*.egg-info/
 coverage.xml
 nosetests.xml
 pep8.txt
diff --git a/run_tests.sh b/run_tests.sh
index badd2c2f..ecd3d208 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -6,7 +6,7 @@ set -o errexit
 # Increment me any time the environment should be rebuilt.
 # This includes dependncy changes, directory renames, etc.
 # Simple integer secuence: 1, 2, 3...
-environment_version=39
+environment_version=40
 #--------------------------------------------------------#
 
 function usage {
@@ -50,8 +50,6 @@ function usage {
 # DEFAULTS FOR RUN_TESTS.SH
 #
 root=`pwd`
-horizon_root=${HORIZON-../horizon}
-export PYTHONPATH=$horizon_root
 venv=$root/.venv
 with_venv=tools/with_venv.sh
 included_dirs="tuskar_ui"
@@ -181,7 +179,7 @@ function environment_check {
     if [ $ENV_VERS -eq $environment_version ]; then
       if [ -e ${venv} ]; then
         # If the environment exists and is up-to-date then set our variables
-        command_wrapper="${horizon_root}/${with_venv}"
+        command_wrapper="${root}/${with_venv}"
         echo "Environment is up to date."
         return 0
       fi
diff --git a/setup.cfg b/setup.cfg
index 4409c1f3..ac5bdd97 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
-name = horizon
+name = tuskar_ui
 version = 2013.2
-summary = OpenStack Dashboard
+summary = Tuskar Management Dashboard
 description-file =
     README.rst
 author = OpenStack
@@ -29,8 +29,7 @@ setup-hooks =
 
 [files]
 packages =
-    horizon
-    openstack_dashboard
+    tuskar_ui
 
 [build_sphinx]
 all_files = 1
diff --git a/test-requirements.txt b/test-requirements.txt
index 276886eb..ade15e14 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,3 +18,5 @@ sphinx>=1.1.2
 # for bug 1091333, remove after sphinx >1.1.3 is released.
 docutils==0.9.1
 oslo.sphinx
+
+-e git://github.com/openstack/horizon.git#egg=horizon
diff --git a/tox.ini b/tox.ini
index e413e8d4..e5714840 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py27dj14,pep8,py33
+envlist = py26,py27,py27dj14,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}