Merge branch 'master' into travis_notification

chanchiem · web-flow · commit 27ca64ef4f45 · 2019-06-13T10:43:42.000-07:00
diff --git a/tests/ext/psycopg2/test_psycopg2.py b/tests/ext/psycopg2/test_psycopg2.py
@@ -144,7 +144,7 @@ def test_execute_bad_query():
     assert sql['database_version']
 
     exception = subsegment.cause['exceptions'][0]
-    assert exception.type == 'ProgrammingError'
+    assert exception.type == 'UndefinedColumn'
 
 
 def test_register_extensions():
