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>
This commit is contained in:
parent
433eb2d4d9
commit
82cd363bf5
2
.gitignore
vendored
2
.gitignore
vendored
@ -6,6 +6,8 @@
|
||||
.coverage*
|
||||
.noseids
|
||||
.DS_STORE
|
||||
*.egg/
|
||||
*.egg-info/
|
||||
coverage.xml
|
||||
nosetests.xml
|
||||
pep8.txt
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user