Merge pull request #878 from jd/psycopg2-2.8

tests: add psycopg2 2.8 support

Author: jd

.circleci/config.yml

@@ -691,7 +691,7 @@ jobs:
       - checkout
       - *restore_cache_step
       - run: tox -e 'wait' postgres mysql
-      - run: tox -e 'sqlalchemy_contrib-{py27,py34,py35,py36}-sqlalchemy{10,11,12}-psycopg2{27}-mysqlconnector' --result-json /tmp/sqlalchemy.results
+      - run: tox -e 'sqlalchemy_contrib-{py27,py34,py35,py36}-sqlalchemy{10,11,12}-psycopg228-mysqlconnector' --result-json /tmp/sqlalchemy.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -725,7 +725,7 @@ jobs:
       - checkout
       - *restore_cache_step
       - run: tox -e 'wait' postgres
-      - run: tox -e 'psycopg_contrib-{py27,py34,py35,py36}-psycopg2{24,25,26,27}' --result-json /tmp/psycopg.results
+      - run: tox -e 'psycopg_contrib-{py27,py34,py35,py36}-psycopg2{24,25,26,27,28}' --result-json /tmp/psycopg.results
       - persist_to_workspace:
           root: /tmp
           paths:

tests/contrib/sqlalchemy/test_postgres.py

@@ -50,8 +50,8 @@ def test_engine_execute_errors(self):
         # check the error
         self.assertEqual(span.error, 1)
         self.assertTrue('relation "a_wrong_table" does not exist' in span.get_tag('error.msg'))
-        self.assertTrue('ProgrammingError' in span.get_tag('error.type'))
-        self.assertTrue('ProgrammingError: relation "a_wrong_table" does not exist' in span.get_tag('error.stack'))
+        assert 'psycopg2.errors.UndefinedTable' in span.get_tag('error.type')
+        assert 'UndefinedTable: relation "a_wrong_table" does not exist' in span.get_tag('error.stack')
 
 
 class PostgresCreatorTestCase(PostgresTestCase):

tox.ini

@@ -87,7 +87,7 @@ envlist =
     mysql_contrib-{py27,py34,py35,py36}-mysqlconnector
     mysqldb_contrib-{py27}-mysqldb{12}
     mysqldb_contrib-{py27,py34,py35,py36}-mysqlclient{13}
-    psycopg_contrib-{py27,py34,py35,py36}-psycopg2{24,25,26,27}
+    psycopg_contrib-{py27,py34,py35,py36}-psycopg2{24,25,26,27,28}
     pylibmc_contrib-{py27,py34,py35,py36}-pylibmc{140,150}
     pylons_contrib-{py27}-pylons{096,097,010,10}
     pymemcache_contrib{,_autopatch}-{py27,py34,py35,py36}-pymemcache{130,140}
@@ -102,7 +102,7 @@ envlist =
 # DEV: This is a known issue for gevent 1.1, suggestion is to upgrade to gevent > 1.2
 #      https://github.com/gevent/gevent/issues/903
     requests_gevent_contrib-{py36}-requests{208,209,210,211,212,213,219}-gevent{12,13}
-    sqlalchemy_contrib-{py27,py34,py35,py36}-sqlalchemy{10,11,12}-psycopg2{27}-mysqlconnector
+    sqlalchemy_contrib-{py27,py34,py35,py36}-sqlalchemy{10,11,12}-psycopg228-mysqlconnector
     sqlite3_contrib-{py27,py34,py35,py36}-sqlite3
     tornado_contrib-{py27,py34,py35,py36}-tornado{40,41,42,43,44,45}
     tornado_contrib-{py27}-tornado{40,41,42,43,44,45}-futures{30,31,32}
@@ -274,6 +274,7 @@ deps =
     psycopg225: psycopg2>=2.5,<2.6
     psycopg226: psycopg2>=2.6,<2.7
     psycopg227: psycopg2>=2.7,<2.8
+    psycopg228: psycopg2>=2.8,<2.9
     redis26: redis>=2.6,<2.7
     redis27: redis>=2.7,<2.8
     redis28: redis>=2.8,<2.9