Merge pull request #3 from emonty/master

Use latest tissue update - ready for gerrit

5 files changed, 23 insertions, 104 deletions

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..48b0423
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/openstack-common.git
diff --git a/README b/README
index 07c7ba0..04da07e 100644
--- a/README
+++ b/README
@@ -1 +1,11 @@
-Common code for Openstack Projects.
\ No newline at end of file
+Common code for Openstack Projects.
+
+To run tests in virtualenvs (preferred):
+
+  sudo pip install tox
+  tox
+
+To run tests in the current environment:
+
+  sudo pip install -r tools/pip-requires
+  nosetests
diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100755
index 7df4cc7..0000000
--- a/run_tests.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-function usage {
-  echo "Usage: $0 [OPTION]..."
-  echo "Run Openstack-Common's test suite(s)"
-  echo ""
-  echo "  -V, --virtual-env        Always use virtualenv.  Install automatically if not present"
-  echo "  -N, --no-virtual-env     Don't use virtualenv.  Run tests in local environment"
-  echo "  -f, --force              Force a clean re-build of the virtual environment. Useful when dependencies have been added."
-  echo "  --unittests-only         Run unit tests only, exclude functional tests."
-  echo "  -p, --pep8               Just run pep8"
-  echo "  -h, --help               Print this usage message"
-  echo ""
-  echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
-  echo "      If no virtualenv is found, the script will ask if you would like to create one.  If you "
-  echo "      prefer to run tests NOT in a virtual environment, simply pass the -N option."
-  exit
-}
-
-function process_option {
-  case "$1" in
-    -h|--help) usage;;
-    -V|--virtual-env) let always_venv=1; let never_venv=0;;
-    -N|--no-virtual-env) let always_venv=0; let never_venv=1;;
-    -p|--pep8) let just_pep8=1;;
-    -f|--force) let force=1;;
-    --unittests-only) noseargs="$noseargs --exclude-dir=tests/functional";;
-    *) noseargs="$noseargs $1"
-  esac
-}
-
-venv=.openstack-common-venv
-with_venv=tools/with_venv.sh
-always_venv=0
-never_venv=0
-force=0
-noseargs=
-wrapper=""
-just_pep8=0
-
-for arg in "$@"; do
-  process_option $arg
-done
-
-function run_tests {
-  # Just run the test suites in current environment
-  ${wrapper} rm -f tests.sqlite
-  ${wrapper} $NOSETESTS 2> run_tests.err.log
-}
-
-function run_pep8 {
-  echo "Running pep8 ..."
-  # FIXME(sirp): bzr version-info is not currently pep-8. This was fixed with
-  # lp701898 [1], however, until that version of bzr becomes standard, I'm just
-  # excluding the vcsversion.py file
-  #
-  # [1] https://bugs.launchpad.net/bzr/+bug/701898
-  #
-  PEP8_EXCLUDE=vcsversion.py
-  PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
-  PEP8_INCLUDE="openstack tools setup.py run_tests.py"
-  ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE
-}
-
-
-NOSETESTS="python run_tests.py $noseargs"
-
-if [ $never_venv -eq 0 ]
-then
-  # Remove the virtual environment if --force used
-  if [ $force -eq 1 ]; then
-    echo "Cleaning virtualenv..."
-    rm -rf ${venv}
-  fi
-  if [ -e ${venv} ]; then
-    wrapper="${with_venv}"
-  else
-    if [ $always_venv -eq 1 ]; then
-      # Automatically install the virtualenv
-      python tools/install_venv.py
-      wrapper="${with_venv}"
-    else
-      echo -e "No virtual environment found...create one? (Y/n) \c"
-      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
-        python tools/install_venv.py
-		    wrapper=${with_venv}
-      fi
-    fi
-  fi
-fi
-
-if [ $just_pep8 -eq 1 ]; then
-    run_pep8
-    exit
-fi
-
-run_tests || exit
-
-if [ -z "$noseargs" ]; then
-  run_pep8
-fi
diff --git a/setup.cfg b/setup.cfg
index f82e970..2ce0f72 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,13 @@ with-coverage=1
 cover-package=openstack.common
 cover-html=1
 cover-inclusive=1
+with-tissue=1
+tissue-repeat=1
+tissue-show-pep8=1
+tissue-show-source=1
+tissue-inclusive=1
+tissue-color=1
+tissue-package=openstack.common
 with-openstack=1
 openstack-red=0.05
 openstack-yellow=0.025
diff --git a/tools/pip-requires b/tools/pip-requires
index e45a94f..05be034 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -5,5 +5,6 @@ PasteDeploy==1.5.0
 eventlet
 nose
 coverage
+tissue
 
 -e git+https://github.com/jkoelker/openstack-nose.git#egg=openstack.nose_plugin