new file mode 100644

@@ -0,0 +1,16 @@

+diff -r b2efb7df637b discover.py

+--- a/discover.py	Thu Mar 24 00:31:02 2011 -0400

+@@ -82,7 +82,11 @@

+     """

+     testMethodPrefix = 'test'

+     sortTestMethodsUsing = cmp

+-    suiteClass = unittest.TestSuite

++    try:

++        import unittest2

++        suiteClass = unittest2.TestSuite

++    except ImportError:

++        suiteClass = unittest.TestSuite

+     _top_level_dir = None

+ 

+     def loadTestsFromTestCase(self, testCaseClass):

@@ -88,9 +88,6 @@ function configure_tempest {

     local boto_instance_type="m1.tiny"

     local ssh_connect_method="fixed"

-    # TODO(afazekas):

-    # sudo python setup.py deploy

-

     # Save IFS

     ifs=$IFS

@@ -406,6 +403,7 @@ function create_tempest_accounts {

 # install_tempest() - Collect source and prepare

 function install_tempest {

     git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH

+    pip_install "tox<1.7"

 }

 # init_tempest() - Initialize ec2 images

@@ -145,4 +145,11 @@ if [[ $DISTRO =~ (rhel6) ]]; then

     # work unmolested.

     sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests

+    # workaround for https://code.google.com/p/unittest-ext/issues/detail?id=79

+    install_package python-unittest2 patch

+    pip_install discover

+    (cd /usr/lib/python2.6/site-packages/; sudo patch <"$FILES/patches/unittest2-discover.patch" || echo 'Assume already applied')

+    # Make sure the discover.pyc is up to date

+    sudo rm /usr/lib/python2.6/site-packages/discover.pyc || true

+    sudo python -c 'import discover'

 fi