From 48f43fd4e96f39a8f575bf2ac1752e7f84044017 Mon Sep 17 00:00:00 2001
From: "Mauro S. M. Rodrigues" <maurosr@linux.vnet.ibm.com>
Date: Thu, 29 Nov 2012 11:56:49 -0500
Subject: Enable debug in run_tests using pdb

    When you try to debug some test using nose.tools.set_trace the pdb prompt
is 'trapped' inside tee manipulation of stdout.
    Since debug mode is not supposed to be used in the gates we don't need to
concern about the lack of a log to analyze the output.

Change-Id: I7daebe7267b04d41f2ca383f826419f0dfb544ab
---
 run_tests.sh | 55 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index b25178766..f424c093e 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -18,6 +18,7 @@ function usage {
   echo "  -c, --coverage           Generate coverage report"
   echo "  -h, --help               Print this usage message"
   echo "  -v, --verbose            Display nosetests in the console"
+  echo "  -d, --debug              Enable pdb's prompt to be displayed during tests. This will run nosetests with --pdb option"
   echo "  --hide-elapsed           Don't print the elapsed time for each test along with slow test list"
   echo ""
   echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
@@ -40,6 +41,7 @@ function process_option {
     -p|--pep8) just_pep8=1;;
     -P|--no-pep8) no_pep8=1;;
     -c|--coverage) coverage=1;;
+    -d|--debug) debug=1;;
     -v|--verbose) verbose=1;;
     -*) noseopts="$noseopts $1";;
     *) noseargs="$noseargs $1"
@@ -62,6 +64,7 @@ coverage=0
 recreate_db=1
 patch_migrate=1
 verbose=0
+debug=0
 
 export NOSE_WITH_OPENSTACK=1
 export NOSE_OPENSTACK_COLOR=1
@@ -90,34 +93,40 @@ fi
 function run_tests {
   # Cleanup *pyc
   ${wrapper} find . -type f -name "*.pyc" -delete
-  # Just run the test suites in current environment
-  if [ "$verbose" -eq 1 ];
+  if [ "$debug" -eq 0 ];
   then
-     ${wrapper} $NOSETESTS 2>&1 | tee nosetests.log
-  else
-     ${wrapper} $NOSETESTS | tee nosetests.log
-  fi
-
-  # If we get some short import error right away, print the error log directly
-  RESULT=$?
-  if [ "$RESULT" -ne "0" ];
-  then
-    ERRSIZE=`wc -l run_tests.log | awk '{print \$1}'`
-    if [ "$ERRSIZE" -lt "40" ];
+    # Just run the test suites in current environment
+    if [ "$verbose" -eq 1 ];
     then
-        cat run_tests.log
+       ${wrapper} $NOSETESTS 2>&1 | tee nosetests.log
+    else
+       ${wrapper} $NOSETESTS | tee nosetests.log
     fi
-  else
-    tests_run=$(awk '/^Ran/ {print $2}' nosetests.log)
-    if [ -z "$tests_run" ] || [ "$tests_run" -eq 0 ];
+
+    # If we get some short import error right away, print the error log directly
+    RESULT=$?
+    if [ "$RESULT" -ne "0" ];
     then
-        echo "ERROR: Zero tests ran, something is wrong!"
-        echo "This is usually caused by a parse error in some python"
-        echo "file or a failure to set up the environment (i.e. during"
-        echo "temporary database preparation). Running nosetests directly"
-        echo "may offer more clues."
-        return 1
+      ERRSIZE=`wc -l run_tests.log | awk '{print \$1}'`
+      if [ "$ERRSIZE" -lt "40" ];
+      then
+          cat run_tests.log
+      fi
+    else
+      tests_run=$(awk '/^Ran/ {print $2}' nosetests.log)
+      if [ -z "$tests_run" ] || [ "$tests_run" -eq 0 ];
+      then
+          echo "ERROR: Zero tests ran, something is wrong!"
+          echo "This is usually caused by a parse error in some python"
+          echo "file or a failure to set up the environment (i.e. during"
+          echo "temporary database preparation). Running nosetests directly"
+          echo "may offer more clues."
+          return 1
+      fi
     fi
+  else
+    ${wrapper} $NOSETESTS --pdb
+    RESULT=$?
   fi
   return $RESULT
 }
-- 
cgit