diff --git a/.travis.yml b/.travis.yml index 27d587cb..74b2ebe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_script: script: export COVERAGE_PROCESS_START=gluon/tests/coverage.ini; ./web2py.py --run_system_tests --with_coverage after_success: + - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage combine; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --config_file=gluon/tests/coverage.ini; fi diff --git a/gluon/tests/test_dal.py b/gluon/tests/test_dal.py index 07ea25ae..568c0f3f 100644 --- a/gluon/tests/test_dal.py +++ b/gluon/tests/test_dal.py @@ -17,12 +17,10 @@ class TestDALSubclass(unittest.TestCase): def testRun(self): import gluon.serializers as mserializers import gluon.validators as mvalidators - from gluon.utils import web2py_uuid from gluon import sqlhtml db = DAL(check_reserved=['all']) self.assertEqual(db.serializers, mserializers) self.assertEqual(db.validators, mvalidators) - self.assertEqual(db.uuid, web2py_uuid) self.assertEqual(db.representers['rows_render'], sqlhtml.represent) self.assertEqual(db.representers['rows_xml'], sqlhtml.SQLTABLE)