You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2018/08/04 22:48:11 UTC

[GitHub] tedmiston closed pull request #3646: [WIP][AIRFLOW-2806] test_mark_success_no_kill test breaks intermittently on CI

tedmiston closed pull request #3646: [WIP][AIRFLOW-2806] test_mark_success_no_kill test breaks intermittently on CI
URL: https://github.com/apache/incubator-airflow/pull/3646
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 81e43fb4b8..3f41d6525d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,15 +54,15 @@ env:
     # does not work with python 3
     - BOTO_CONFIG=/tmp/bogusvalue
   matrix:
-    - TOX_ENV=py27-backend_mysql
-    - TOX_ENV=py27-backend_sqlite
-    - TOX_ENV=py27-backend_postgres
-    - TOX_ENV=py35-backend_mysql
-    - TOX_ENV=py35-backend_sqlite
+    # - TOX_ENV=py27-backend_mysql
+    # - TOX_ENV=py27-backend_sqlite
+    # - TOX_ENV=py27-backend_postgres
+    # - TOX_ENV=py35-backend_mysql
+    # - TOX_ENV=py35-backend_sqlite
     - TOX_ENV=py35-backend_postgres
-    - TOX_ENV=flake8
-    - TOX_ENV=py27-backend_postgres KUBERNETES_VERSION=v1.9.0
-    - TOX_ENV=py35-backend_postgres KUBERNETES_VERSION=v1.10.0
+    # - TOX_ENV=flake8
+    # - TOX_ENV=py27-backend_postgres KUBERNETES_VERSION=v1.9.0
+    # - TOX_ENV=py35-backend_postgres KUBERNETES_VERSION=v1.10.0
 matrix:
   exclude:
     - python: "3.5"
diff --git a/scripts/ci/kubernetes/docker/Dockerfile b/scripts/ci/kubernetes/docker/Dockerfile
index 498c47b21a..ef72a6c08c 100644
--- a/scripts/ci/kubernetes/docker/Dockerfile
+++ b/scripts/ci/kubernetes/docker/Dockerfile
@@ -40,7 +40,7 @@ RUN pip install --upgrade pip
 RUN pip install -U setuptools && \
     pip install kubernetes && \
     pip install cryptography && \
-    pip install psycopg2-binary==2.7.4  # I had issues with older versions of psycopg2, just a warning
+    pip install psycopg2-binary>=2.7.4  # I had issues with older versions of psycopg2, just a warning
 
 # install airflow
 COPY airflow.tar.gz /tmp/airflow.tar.gz
diff --git a/setup.py b/setup.py
index 50af30944e..bf4ce1d1cf 100644
--- a/setup.py
+++ b/setup.py
@@ -299,7 +299,7 @@ def do_setup():
             'python-nvd3==0.15.0',
             'requests>=2.5.1, <3',
             'setproctitle>=1.1.8, <2',
-            'sqlalchemy>=1.1.15, <1.2.0',
+            'sqlalchemy>=1.1.15, <1.3.0',
             'sqlalchemy-utc>=0.9.0',
             'tabulate>=0.7.5, <0.8.0',
             'tenacity==4.8.0',
diff --git a/tests/jobs.py b/tests/jobs.py
index 93f6574df4..d4184236d8 100644
--- a/tests/jobs.py
+++ b/tests/jobs.py
@@ -1086,10 +1086,10 @@ def test_localtaskjob_heartbeat(self, mock_pid):
         mock_pid.return_value = 2
         self.assertRaises(AirflowException, job1.heartbeat_callback)
 
-    @unittest.skipIf('mysql' in configuration.conf.get('core', 'sql_alchemy_conn'),
-                     "flaky when run on mysql")
-    @unittest.skipIf('postgresql' in configuration.conf.get('core', 'sql_alchemy_conn'),
-                     'flaky when run on postgresql')
+    # @unittest.skipIf('mysql' in configuration.conf.get('core', 'sql_alchemy_conn'),
+    #                  "flaky when run on mysql")
+    # @unittest.skipIf('postgresql' in configuration.conf.get('core', 'sql_alchemy_conn'),
+    #                  'flaky when run on postgresql')
     def test_mark_success_no_kill(self):
         """
         Test that ensures that mark_success in the UI doesn't cause


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services