Merge pull request #176 from GoogleCloudPlatform/canary

Canary

.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

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)
 

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

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

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

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 =
@@ -72,6 +75,9 @@ commands =
     nosetests \
         --exclude-dir=appengine \
         {[testenv]commonargs} \
+        --with-xunit \
+        --xunit-testsuite-name py27 \
+        --xunit-file nosetests-py27.xml \
         {posargs}
 
 [testenv:py34-all]
@@ -82,6 +88,9 @@ commands =
     nosetests \
         --exclude-dir=appengine \
         {[testenv]commonargs} \
+        --with-xunit \
+        --xunit-testsuite-name py34 \
+        --xunit-file nosetests-py34.xml \
         {posargs}
 
 [testenv:pep8]