Use docker and add some fixes

Author: ildus

.travis.yml

@@ -1,48 +1,24 @@
-language: "python"
-
 sudo: required
 
 services:
-   - postgresql
-
-env:
-   - PG_VER=9.5
-   - PG_VER=9.6
-   - PG_VER=10
-
-python:
-   - "2.7"
-   - "3.5"
-   - "3.6"
-   - "pypy"
-   - "pypy3"
-
-before_install:
-   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install -qq wget ca-certificates; fi
-   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo sh ./travis/dep-ubuntu-postgres.sh; fi
-   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
-
-install:
-   - sudo service postgresql stop
-   - echo 'exit 0' | sudo tee /etc/init.d/postgresql
-   - sudo chmod a+x /etc/init.d/postgresql
+    - docker
 
 before_script:
-   - sudo pg_createcluster --start $PG_VER testgres -- -A trust
-   - sudo chmod a+w /var/run/postgresql/
-   - sudo /etc/init.d/postgresql restart
-   - export PG_CONFIG=/usr/lib/postgresql/$PG_VER/bin/pg_config
-   - virtualenv /tmp/envs/testgres
-   - source /tmp/envs/testgres/bin/activate
-   - pip install six psycopg2 pg8000 flake8
-   - python setup.py install
+    - sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl  > Dockerfile
+    - docker-compose build
 
 script:
-   - cd testgres/tests
-   - python -m unittest test_simple
-   - flake8 --ignore=W191,F401,E501,F403 .
+    - docker-compose run tests
 
 notifications:
-  email:
-    on_success: change
-    on_failure: always
+    email:
+        on_success: change
+        on_failure: always
+
+matrix:
+    - PYTHON_VERSION=2 PG_VERSION=10
+    - PYTHON_VERSION=2 PG_VERSION=9.6
+    - PYTHON_VERSION=2 PG_VERSION=9.5
+    - PYTHON_VERSION=3 PG_VERSION=10
+    - PYTHON_VERSION=3 PG_VERSION=9.6
+    - PYTHON_VERSION=3 PG_VERSION=9.5

testgres/testgres.py

@@ -244,7 +244,7 @@ def connstr(self):
     def get_bin_path(self, filename):
         """ Returns full path to an executable """
         pg_config = get_config()
-        if "BINDIR" not in pg_config:
+        if pg_config is None or "BINDIR" not in pg_config:
             return filename
         else:
             return os.path.join(pg_config.get("BINDIR"), filename)
@@ -684,12 +684,15 @@ def get_config():
         pg_config_cmd = os.environ.get("PG_CONFIG") \
             if "PG_CONFIG" in os.environ else "pg_config"
 
-        out = six.StringIO(
-            subprocess.check_output([pg_config_cmd], universal_newlines=True))
-        for line in out:
-            if line and "=" in line:
-                key, value = line.split("=", 1)
-                pg_config_data[key.strip()] = value.strip()
+        try:
+            out = six.StringIO(
+                subprocess.check_output([pg_config_cmd], universal_newlines=True))
+            for line in out:
+                if line and "=" in line:
+                    key, value = line.split("=", 1)
+                    pg_config_data[key.strip()] = value.strip()
+        except OSError:
+            return None
 
         # Numeric version format
         version_parts = pg_config_data.get("VERSION").split(" ")

testgres/tests/test_simple.py

@@ -39,7 +39,8 @@ def test_backup_and_replication(self):
         replica.start()
         res = replica.execute('postgres', 'select * from abc')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0], (1, 2))
+        self.assertEqual(res[0][0], 1)
+        self.assertEqual(res[0][1], 2)
 
         # Prepare the query which would check whether record reached replica
         # (It is slightly different for Postgres 9.6 and Postgres 10+)
@@ -59,7 +60,8 @@ def test_backup_and_replication(self):
         # Check that this record was exported to replica
         res = replica.execute('postgres', 'select * from abc')
         self.assertEqual(len(res), 2)
-        self.assertEqual(res[1], (3, 4))
+        self.assertEqual(res[1][0], 3)
+        self.assertEqual(res[1][1], 4)
 
         node.stop()
         replica.stop()