Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1c712e5

Browse filesBrowse files
author
Jonathan Wayne Parrott
committed
Merge pull request GoogleCloudPlatform#176 from GoogleCloudPlatform/canary
Canary
2 parents 640109c + 3e029c0 commit 1c712e5
Copy full SHA for 1c712e5

File tree

Expand file treeCollapse file tree

6 files changed

+22
-6
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+22
-6
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ before_install:
2424
install:
2525
# TODO: unpin tox when the following issue is fixed
2626
# https://bitbucket.org/hpk42/tox/issues/285/tox-220-breaks-some-toxini-config-files
27-
- pip install tox coveralls
27+
- pip install tox
2828

2929
script:
3030
- tox
3131

32-
after_success:
33-
- coveralls
32+
# Coveralls is disabled in travis because travis does not run all of our
33+
# tests. The full suite of tests is run on an internal Jenkins instance.
34+
# after_success:
35+
# - coveralls

‎appengine/cloudsql/main_test.py

Copy file name to clipboardExpand all lines: appengine/cloudsql/main_test.py
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
15+
import os
1416
import re
17+
from unittest.case import SkipTest
1518

1619
import tests
1720
import webtest
@@ -22,6 +25,8 @@
2225
class TestMySQLSample(tests.AppEngineTestbedCase):
2326

2427
def setUp(self):
28+
if not os.path.exists('/var/run/mysqld/mysqld.sock'):
29+
raise SkipTest('No MySQL server found.')
2530
super(TestMySQLSample, self).setUp()
2631
self.app = webtest.TestApp(main.app)
2732

+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Django==1.9.2
22
mysqlclient==1.3.7
3-
wheel==0.27.0
3+
wheel==0.28.0
44
gunicorn==19.4.5

‎datastore/api/snippets_test.py

Copy file name to clipboardExpand all lines: datastore/api/snippets_test.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def test_multi_sort(self):
209209
@eventually_consistent
210210
def test_keys_only_query(self):
211211
keys = snippets.keys_only_query(self.client)
212-
self.to_delete_keys.extend(keys)
212+
self.to_delete_entities.extend(self.client.query(kind='Task').fetch())
213213
self.assertTrue(keys)
214214

215215
@eventually_consistent
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Django==1.9.2
22
mysqlclient==1.3.7
3-
wheel==0.27.0
3+
wheel==0.28.0
44
gunicorn==19.4.5

‎tox.ini

Copy file name to clipboardExpand all lines: tox.ini
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ commands =
4141
nosetests --with-gae \
4242
--gae-app=tests/resources/app.yaml \
4343
--logging-level=INFO \
44+
--with-xunit \
45+
--xunit-testsuite-name gae \
46+
--xunit-file nosetests-gae.xml \
4447
{[testenv]commonargs} \
4548
{posargs:appengine}
4649
setenv =
@@ -72,6 +75,9 @@ commands =
7275
nosetests \
7376
--exclude-dir=appengine \
7477
{[testenv]commonargs} \
78+
--with-xunit \
79+
--xunit-testsuite-name py27 \
80+
--xunit-file nosetests-py27.xml \
7581
{posargs}
7682

7783
[testenv:py34-all]
@@ -82,6 +88,9 @@ commands =
8288
nosetests \
8389
--exclude-dir=appengine \
8490
{[testenv]commonargs} \
91+
--with-xunit \
92+
--xunit-testsuite-name py34 \
93+
--xunit-file nosetests-py34.xml \
8594
{posargs}
8695

8796
[testenv:pep8]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.