From f9db6ef7123b60647a60764db7155fcd936105c0 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Fri, 5 Feb 2016 11:27:05 -0800 Subject: [PATCH 1/8] Skipping mysql tests if mysql is not locally available. --- appengine/cloudsql/main_test.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appengine/cloudsql/main_test.py b/appengine/cloudsql/main_test.py index bd70d12cb5c..2b7304c8188 100644 --- a/appengine/cloudsql/main_test.py +++ b/appengine/cloudsql/main_test.py @@ -11,7 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +import os import re +from unittest.case import SkipTest import tests import webtest @@ -22,6 +25,8 @@ class TestMySQLSample(tests.AppEngineTestbedCase): def setUp(self): + if not os.path.exists('/var/run/mysqld/mysqld.sock'): + raise SkipTest('No MySQL server found.') super(TestMySQLSample, self).setUp() self.app = webtest.TestApp(main.app) From b86f851c15527364b94f125df42791bc989cd01c Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 3 Feb 2016 12:59:40 -0800 Subject: [PATCH 2/8] Adding Xunit reporting to -all environments. --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 99e4c4feef2..b0bcb733f30 100644 --- a/tox.ini +++ b/tox.ini @@ -72,6 +72,7 @@ commands = nosetests \ --exclude-dir=appengine \ {[testenv]commonargs} \ + --with-xunit \ {posargs} [testenv:py34-all] @@ -82,6 +83,7 @@ commands = nosetests \ --exclude-dir=appengine \ {[testenv]commonargs} \ + --with-xunit \ {posargs} [testenv:pep8] From 12efdf94b6213a8c74a03ed1403d03ad4fbbe7ed Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 3 Feb 2016 13:21:56 -0800 Subject: [PATCH 3/8] Adding testsuite name to xunit reports. --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index b0bcb733f30..d30634f427e 100644 --- a/tox.ini +++ b/tox.ini @@ -73,6 +73,7 @@ commands = --exclude-dir=appengine \ {[testenv]commonargs} \ --with-xunit \ + --xunit-testsuite-name py27 \ {posargs} [testenv:py34-all] @@ -84,6 +85,7 @@ commands = --exclude-dir=appengine \ {[testenv]commonargs} \ --with-xunit \ + --xunit-testsuite-name py34 \ {posargs} [testenv:pep8] From fc3ec2714a20f36203dc93833a33a6b759870260 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 3 Feb 2016 13:39:23 -0800 Subject: [PATCH 4/8] Separate xunit files for py27 and py34. --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index d30634f427e..35196106ed8 100644 --- a/tox.ini +++ b/tox.ini @@ -74,6 +74,7 @@ commands = {[testenv]commonargs} \ --with-xunit \ --xunit-testsuite-name py27 \ + --xunit-file nosetests-py27.xml \ {posargs} [testenv:py34-all] @@ -86,6 +87,7 @@ commands = {[testenv]commonargs} \ --with-xunit \ --xunit-testsuite-name py34 \ + --xunit-file nosetests-py34.xml \ {posargs} [testenv:pep8] From dc13b080e9320df4a71e1eece5a3d154bdb0bf68 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 3 Feb 2016 13:45:10 -0800 Subject: [PATCH 5/8] Disabling coveralls in travis. --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10b8928c8d8..e8f3c017120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,12 @@ before_install: install: # TODO: unpin tox when the following issue is fixed # https://bitbucket.org/hpk42/tox/issues/285/tox-220-breaks-some-toxini-config-files -- pip install tox coveralls +- pip install tox script: - tox -after_success: -- coveralls +# Coveralls is disabled in travis because travis does not run all of our +# tests. The full suite of tests is run on an internal Jenkins instance. +# after_success: +# - coveralls From 84da96b580458f14b47db0fc632f42bff3778601 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 3 Feb 2016 14:23:45 -0800 Subject: [PATCH 6/8] Adding xunit reporting for app engine. --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 35196106ed8..d754bc9ed36 100644 --- a/tox.ini +++ b/tox.ini @@ -41,6 +41,9 @@ commands = nosetests --with-gae \ --gae-app=tests/resources/app.yaml \ --logging-level=INFO \ + --with-xunit \ + --xunit-testsuite-name gae \ + --xunit-file nosetests-gae.xml \ {[testenv]commonargs} \ {posargs:appengine} setenv = From 8f33e3660f214d827db9a880e2b61a2163dea1e7 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Fri, 5 Feb 2016 14:24:25 -0800 Subject: [PATCH 7/8] Fixing erroneously trying to delete reserved keys. --- datastore/api/snippets_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore/api/snippets_test.py b/datastore/api/snippets_test.py index c65ce935485..1ccccc7dd82 100644 --- a/datastore/api/snippets_test.py +++ b/datastore/api/snippets_test.py @@ -209,7 +209,7 @@ def test_multi_sort(self): @eventually_consistent def test_keys_only_query(self): keys = snippets.keys_only_query(self.client) - self.to_delete_keys.extend(keys) + self.to_delete_entities.extend(self.client.query(kind='Task').fetch()) self.assertTrue(keys) @eventually_consistent From 3e029c0f28122cd37b8b69c20110a5477346efeb Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Fri, 5 Feb 2016 14:50:23 -0800 Subject: [PATCH 8/8] Upgrading reqs --- container_engine/django_tutorial/requirements.txt | 2 +- managed_vms/django_cloudsql/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_engine/django_tutorial/requirements.txt b/container_engine/django_tutorial/requirements.txt index c788d762a7f..163a26d7707 100644 --- a/container_engine/django_tutorial/requirements.txt +++ b/container_engine/django_tutorial/requirements.txt @@ -1,4 +1,4 @@ Django==1.9.2 mysqlclient==1.3.7 -wheel==0.27.0 +wheel==0.28.0 gunicorn==19.4.5 diff --git a/managed_vms/django_cloudsql/requirements.txt b/managed_vms/django_cloudsql/requirements.txt index c788d762a7f..163a26d7707 100644 --- a/managed_vms/django_cloudsql/requirements.txt +++ b/managed_vms/django_cloudsql/requirements.txt @@ -1,4 +1,4 @@ Django==1.9.2 mysqlclient==1.3.7 -wheel==0.27.0 +wheel==0.28.0 gunicorn==19.4.5