From 356151bfb4270a4efbd0e66416ea3bd3d809ccc6 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Sun, 23 Jul 2017 23:22:51 +0300 Subject: [PATCH] test: make StringTypeParameterTest 8.3+ since 8.2 misses enum types PostgreSQL 8.2 tests at Travis should be green now, so removing allow_failures configuration --- .travis.yml | 7 ------- .../org/postgresql/test/jdbc3/StringTypeParameterTest.java | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53a6cce8cf..8ec97ad736 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,13 +54,6 @@ cache: matrix: fast_finish: true - allow_failures: - - env: # this has to match the environment for 8.2 below - - PG_VERSION=8.2 - - XA=true - - COVERAGE=Y - - NO_HSTORE=Y - - CREATE_PLPGSQL=Y include: - jdk: oraclejdk8 env: RUN_CHECKSTYLE=true diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/StringTypeParameterTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/StringTypeParameterTest.java index 29015e02f6..e69dbc40fd 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/StringTypeParameterTest.java +++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/StringTypeParameterTest.java @@ -9,6 +9,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.postgresql.core.ServerVersion; import org.postgresql.jdbc.PreferQueryMode; import org.postgresql.test.TestUtil; import org.postgresql.test.jdbc2.BaseTest4; @@ -40,6 +41,8 @@ public StringTypeParameterTest(String stringType) { @Override public void setUp() throws Exception { super.setUp(); + // Assume enum supported + Assume.assumeTrue(TestUtil.haveMinimumServerVersion(con, ServerVersion.v8_3)); TestUtil.createEnumType(con, "mood", "'happy', 'sad'"); TestUtil.createTable(con, "stringtypetest", "m mood"); }