Skip to content

Commit 89880d7

Browse files
author
Jonathan Wayne Parrott
committed
Merge pull request #76 from GoogleCloudPlatform/appengine-consolidation
Organizing all app engine samples under appengine
2 parents 2d363d5 + 0fa8780 commit 89880d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+28
-25
lines changed

.coveragerc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
include =
33
appengine/*
44
bigquery/*
5+
blog/*
6+
compute/*
57
datastore/*
6-
localtesting/*
8+
monitoring/*
79
storage/*
8-
blog/*
910
[report]
1011
exclude_lines =
1112
pragma: NO COVER
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

bigquery/tests/appengine/test_appengine_auth.py renamed to appengine/bigquery/tests/test_appengine_auth.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from apiclient.http import HttpMock
1919

20-
from bigquery.samples.appengine_auth import main
20+
from appengine.bigquery import main
2121

2222
import mock
2323

@@ -26,10 +26,6 @@
2626
import webapp2
2727

2828

29-
RESOURCE_PATH = os.path.join(
30-
os.path.abspath(os.path.dirname(__file__)), '..', 'resources')
31-
32-
3329
class TestAuthSample(tests.DatastoreTestbedCase, tests.CloudBaseTest):
3430

3531
def setUp(self):
@@ -71,7 +67,7 @@ def test_oauthed_get(self, *args):
7167
request = webapp2.Request.blank('/')
7268

7369
mock_http = HttpMock(
74-
os.path.join(RESOURCE_PATH, 'datasets-list.json'),
70+
os.path.join(self.resource_path, 'datasets-list.json'),
7571
{'status': '200'})
7672
with mock.patch.object(main.decorator, 'http', return_value=mock_http):
7773
original_projectid = main.PROJECTID

0 commit comments

Comments
 (0)