From b4cd6f1fabff3ae9cb8929339b07b4d8b4adc410 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Mon, 25 Feb 2013 15:16:23 -0500
Subject: [PATCH] Remove nose wrapper script

Change-Id: I8e244aa892ac66dddd1be96369dfb0e90cc1543d
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
---
 setup.cfg         |  1 -
 tox.ini           |  5 +++--
 wrap_nosetests.sh | 13 -------------
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100755 wrap_nosetests.sh

diff --git a/setup.cfg b/setup.cfg
index 68f85d6a9b..906ccc2f3c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,6 @@ cover-erase = true
 cover-inclusive = true
 verbosity=2
 detailed-errors=1
-where=tests
 
 [build_sphinx]
 all_files = 1
diff --git a/tox.ini b/tox.ini
index f4fc7fba92..754ff0be6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,14 +10,15 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_RED=0.05
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
-commands = {toxinidir}/wrap_nosetests.sh --no-path-adjustment []
+commands =
+    nosetests --no-path-adjustment --where=./tests
 sitepackages = False
 
 [testenv:livedb]
 setenv=CEILOMETER_TEST_LIVE=1
 
 [testenv:cover]
-commands = {toxinidir}/wrap_nosetests.sh --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive []
+commands = nosetests --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive []
 
 [testenv:pep8]
 deps = -r{toxinidir}/tools/test-requires
diff --git a/wrap_nosetests.sh b/wrap_nosetests.sh
deleted file mode 100755
index 3c0c75b608..0000000000
--- a/wrap_nosetests.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Wrap nosetests to force it to enable global site-packages until
-# https://bitbucket.org/hpk42/tox/issue/32 is released.
-
-set -x
-
-rm -rf cover
-if [ ! -z "$VIRTUAL_ENV" ]
-then
-	rm -f $VIRTUAL_ENV/lib/python*/no-global-site-packages.txt
-fi
-
-nosetests "$@"