Merge pull request #108 from tvincentNuoDB/master

Added Python 3.0+ testing

Author: mjmichaels

.travis.yml

@@ -2,6 +2,7 @@ language: python
 
 python:
   - "2.7"
+  - "3.4"
 
 env:
   - NUODB_VERSION=2.1 NUOVERSION=2.1.1.10 NUODB_ADD_DOMAIN_PASS=yes NUODB_START_AGENT=yes
@@ -22,12 +23,8 @@ before_install:
   - if [[ "${NUODB_ADD_DOMAIN_PASS}" == "yes" ]] ; then sudo chmod 777 /opt/nuodb/etc/default.properties; echo "domainPassword = bird" >> /opt/nuodb/etc/default.properties; sudo chmod 600 /opt/nuodb/etc/default.properties; fi
   - if [[ "${NUODB_START_AGENT}" == "yes" ]]; then sudo service nuoagent start; fi
 
-install:
-  - pip install -r requirements.txt
-  
 script:
   - make all
-  - py.test --cov=pynuodb --cov-report term-missing
 
 after_failure:
   - cat /var/log/nuodb/agent.log

tests/nuodb_basic_test.py

@@ -791,10 +791,12 @@ def test_param_date_error(self):
         cursor.execute("create table typetest (id integer GENERATED ALWAYS AS IDENTITY, date_col date)")
 
         test_vals = (pynuodb.Date(1800, 1, 1),)
-
-        with self.assertRaises(pynuodb.DataError):
+        try:
             cursor.execute("insert into typetest (date_col) values (?)", test_vals)
-
+        except pynuodb.DataError:
+            pass
+        except:
+            self.fail()
 
 if __name__ == '__main__':
     unittest.main()