Author: gjm Date: Tue May 14 16:27:18 2013 New Revision: 1482428 URL: http://svn.apache.org/r1482428 Log: swapping comparison of python version to one that should work - #525
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py?rev=1482428&r1=1482427&r2=1482428&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py (original) +++ bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py Tue May 14 16:27:18 2013 @@ -18,7 +18,7 @@ # specific language governing permissions and limitations # under the License. import sys -if sys.version < (2, 7): +if sys.version_info[:2] < (2, 7): import unittest2 as unittest else: import unittest @@ -48,3 +48,5 @@ def suite(): if __name__ == '__main__': unittest.main(defaultTest='suite') +else: + test_suite = suite() Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py?rev=1482428&r1=1482427&r2=1482428&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py (original) +++ bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py Tue May 14 16:27:18 2013 @@ -25,7 +25,7 @@ import contextlib import shutil import sys import tempfile -if sys.version < (2, 7): +if sys.version_info[:2] < (2, 7): import unittest2 as unittest else: import unittest Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py?rev=1482428&r1=1482427&r2=1482428&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py (original) +++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py Tue May 14 16:27:18 2013 @@ -19,7 +19,7 @@ # under the License. import sys -if sys.version < (2, 7): +if sys.version_info[:2] < (2, 7): import unittest2 as unittest else: import unittest Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py?rev=1482428&r1=1482427&r2=1482428&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py (original) +++ bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py Tue May 14 16:27:18 2013 @@ -18,7 +18,7 @@ # specific language governing permissions and limitations # under the License. import sys -if sys.version < (2, 7): +if sys.version_info[:2] < (2, 7): import unittest2 as unittest else: import unittest Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py?rev=1482428&r1=1482427&r2=1482428&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py (original) +++ bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py Tue May 14 16:27:18 2013 @@ -22,7 +22,7 @@ import os import shutil import sys import tempfile -if sys.version < (2, 7): +if sys.version_info[:2] < (2, 7): import unittest2 as unittest else: import unittest