From 36e266e7ff897824eb6620d60c27b85061e35810 Mon Sep 17 00:00:00 2001
From: Joe Heck <heckj@mac.com>
Date: Wed, 31 Aug 2011 16:19:40 -0700
Subject: [PATCH] fixing run_tests - typo, missing requires

---
 .gitignore                             |  2 ++
 openstack-dashboard/tools/pip-requires |  2 ++
 run_tests.sh                           | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 903d2b467..19b41d8ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.swp
 .coverage
 coverage.xml
+pep8.txt
+pylint.txt
 reports
 django-openstack/.installed.cfg
 django-openstack/bin
diff --git a/openstack-dashboard/tools/pip-requires b/openstack-dashboard/tools/pip-requires
index 96c432145..67d4f55d7 100644
--- a/openstack-dashboard/tools/pip-requires
+++ b/openstack-dashboard/tools/pip-requires
@@ -15,6 +15,8 @@ PasteDeploy
 sqlalchemy-migrate
 eventlet
 xattr
+pep8
+pylint
 coverage
 
 bzr+https://launchpad.net/glance#egg=glance
diff --git a/run_tests.sh b/run_tests.sh
index 1d7934618..958e0138d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -37,7 +37,7 @@ function process_option {
 function run_pylint {
   echo "Running pylint ..."
   PYLINT_INCLUDE="openstack-dashboard/dashboard django-openstack/django_openstack"
-  ${wrapper} pylint --rcfile=.pylintrc -f parseable $PYLINT_INCLUDE > pylint.txt
+  ${django_wrapper} pylint --rcfile=.pylintrc -f parseable $PYLINT_INCLUDE > pylint.txt
   CODE=$?
   grep Global -A2 pylint.txt
   if [ $CODE -lt 32 ]
@@ -53,7 +53,8 @@ function run_pep8 {
   PEP8_EXCLUDE=vcsversion.py
   PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
   PEP8_INCLUDE="openstack-dashboard/dashboard django-openstack/django_openstack"
-  ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE > pep8.txt
+  echo "${django_wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE > pep8.txt"
+  ${django_wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE > pep8.txt
   #perl string strips out the [ and ] characters
   #${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE | perl -ple 's/: ([WE]\d+)/: [$1]/' > pep8.txt
 }
@@ -91,7 +92,9 @@ then
   else
     if [ $always_venv -eq 1 ]; then
       # Automatically install the virtualenv
+      cd openstack-dashboard
       python tools/install_venv.py
+      cd ..
       django_wrapper="${django_with_venv}"
       dashboard_wrapper="${dashboard_with_venv}"
     else
@@ -99,7 +102,9 @@ then
       read use_ve
       if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
         # Install the virtualenv and run the test suite in it
+        cd openstack-dashboard
         python tools/install_venv.py
+        cd ..
         django_wrapper="${django_with_venv}"
         dashboard_wrapper="${dashboard_with_venv}"
       fi
@@ -135,6 +140,14 @@ function run_tests {
 
 if [ $just_pep8 -eq 1 ]; then
     run_pep8
+
+#capability discovery
+
+#capability discovery
+#store & compare arista -> Mongo - quarantine
+#SMBios probes
+#store & compare arista -> Mongo - quarantine
+#SMBios probes
     exit $?
 fi