0001-tests-add-support-for-pg_virtualenv.patch

Benjamin Dauvergne, 24 septembre 2019 15:28

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/7] tests: add support for pg_virtualenv

 Jenkinsfile       | 14 ++++++++++++--
 tests/conftest.py | 15 +++++++++++++--
 tox.ini           |  4 ++++
 3 files changed, 29 insertions(+), 4 deletions(-)

     pipeline {
         agent any
         options { disableConcurrentBuilds() }
         environment {
             TMPDIR = "/tmp/$BUILD_TAG"
+        }
         stages {
             stage('Unit Tests') {
                 steps {
                     sh 'tox -rv'
                     sh """
     mkdir ${env.TMPDIR}
     virtualenv venv
     ./venv/bin/pip install tox
     PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ./venv/bin/tox -rv
     """
+                }
                 post {
                     always {
-...
                     utils.mail_notify(currentBuild, env, 'admin+jenkins-wcs-olap@entrouvert.com')
+                }
+            }
             success {
             cleanup {
                 sh "rm -rf ${env.TMPDIR}"
                 cleanWs()
+            }
+        }

         def __init__(self):
             self.db_name = 'db%s' % random.getrandbits(20)
             self.dsn = 'dbname=%s' % self.db_name
             with closing(psycopg2.connect('')) as conn:
             self.connect_kwargs = {
                 'dbname': 'postgres'
+            }
             for variable, key in [
                     ('PGHOST', 'host'),
                     ('PGUSER', 'user'),
                     ('PGPASSWORD', 'password'),
                     ('PGPORT', 'port'),
                     ('PGDATABASE', 'dbname')]:
                 if variable in os.environ:
                     self.connect_kwargs[key] = os.environ[variable]
             with closing(psycopg2.connect(**self.connect_kwargs)) as conn:
                 conn.set_isolation_level(0)
                 with conn.cursor() as cursor:
                     cursor.execute('CREATE DATABASE %s' % self.db_name)
-...
             return closing(psycopg2.connect(self.dsn))
         def delete(self):
             with closing(psycopg2.connect('')) as conn:
             with closing(psycopg2.connect(**self.connect_kwargs)) as conn:
                 conn.set_isolation_level(0)
                 with conn.cursor() as cursor:
                     cursor.execute('DROP DATABASE IF EXISTS %s' % self.db_name)

     setenv =
     	coverage: COVERAGE=--junit-xml=junit.xml --cov=wcs_olap --cov-report xml --cov-report html
     	WCSCTL=wcs/wcsctl.py
     	PGPORT={env:PGPORT:}
     	PGHOST={env:PGHOST:}
     	PGUSER={env:PGUSER:}
     	PGPASSWORD={env:PGPASSWORD:}
     deps =
     	coverage
     	pytest
+    -

Projet

Général

Profil

Produits Entr'ouvert » OLAP / Business Intelligence pour Publik

0001-tests-add-support-for-pg_virtualenv.patch