Merging upstream version 1.14.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/tests/test_sqlexecute.py b/tests/test_sqlexecute.py
index 2bdc84c..b1be9ac 100644
--- a/tests/test_sqlexecute.py
+++ b/tests/test_sqlexecute.py
@@ -38,13 +38,15 @@ def test_binary(executor):
 
 
 ## Failing in Travis for some unknown reason.
-# @dbtest
-# def test_table_and_columns_query(executor):
-#     run(executor, "create table a(x text, y text)")
-#     run(executor, "create table b(z text)")
-
-#     assert set(executor.tables()) == set([("a",), ("b",)])
-#     assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z")])
+@dbtest
+def test_table_and_columns_query(executor):
+    run(executor, "create table a(x text, y text)")
+    run(executor, "create table b(z text)")
+    run(executor, "create table t(t text)")
+
+    assert set(executor.tables()) == set([("a",), ("b",), ("t",)])
+    assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
+    assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
 
 
 @dbtest