Merge pull request #84 from GoogleCloudPlatform/test-lint

Adding linting to tests

Author: Jon Wayne Parrott

.travis.yml

@@ -9,3 +9,4 @@ before_script:
 script:
 - make test-vmruntime
 - make build
+- make -C tests/e2e/client lint

tests/e2e/client/Makefile

@@ -1,16 +1,24 @@
 include ../../../common.mk
 
 .PHONY: all
-all: upload test
+all: lint upload test
 
 .PHONY: test
-test:
+test: virtualenv
 	virtualenv env
-	env/bin/pip install -r requirements.txt
 	env/bin/python main.py http://${GCLOUD_PROJECT}.appspot.com/
 
 .PHONY: upload
 upload:
 	-e gsutil mb ${BUCKET} &> /dev/null
 	gsutil rm ${BUCKET}/**
 	gsutil cp ../tests/* ${BUCKET} &> /dev/null
+
+.PHONY: virtualenv
+virtualenv:
+	virtualenv env
+	env/bin/pip install -r requirements.txt
+
+.PHONY: lint
+lint: virtualenv
+	env/bin/flake8 --import-order-style=google ../tests

tests/e2e/client/requirements.txt

@@ -1 +1,3 @@
 requests
+flake8
+flake8-import-order

tests/e2e/tests/app_identity_test.py

@@ -1,3 +1,17 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
 from google.appengine.api import app_identity
 
 

tests/e2e/tests/logging_test.py

@@ -1,26 +1,38 @@
-from google.appengine.api.logservice import logservice
-import json
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 logging
 import os
-import pytest
 
+from google.appengine.api.logservice import logservice
+import pytest
 
 
 @pytest.fixture
 def request_id():
-  return os.environ.get('REQUEST_LOG_ID')
+    return os.environ.get('REQUEST_LOG_ID')
+
 
 @pytest.mark.xfail
 def do_not_run_test_logservice_fetch(request_id):
-  """This test fails at logservice.fetch"""
-  logging.info('TESTING')
-  found_log = False
-  for req_log in logservice.fetch(
-      request_ids=[request_id],
-      include_app_logs=True):
-    for app_log in req_log.app_logs:
-      if app_log.message == 'TESTING':
-        found_log = True
-
-  assert found_log
+    """This test fails at logservice.fetch"""
+    logging.info('TESTING')
+    found_log = False
+    for req_log in logservice.fetch(request_ids=[request_id],
+                                    include_app_logs=True):
+        for app_log in req_log.app_logs:
+            if app_log.message == 'TESTING':
+                found_log = True
 
+    assert found_log

tests/e2e/tests/memcache_test.py

@@ -1,16 +1,31 @@
-from google.appengine.api import memcache
-import pytest
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 time
 
+from google.appengine.api import memcache
+
 key1 = 'key1'
 data1 = 'data1'
 timeout = 2
 timeout_tolerance = 2
 
+
 def test_memcache():
-  assert memcache.get(key1) == None
-  memcache.set(key1, data1)
-  assert memcache.get(key1) == data1
-  assert memcache.set(key1, data1, timeout)
-  time.sleep(timeout + timeout_tolerance)
-  assert memcache.get(key1) == None
+    assert memcache.get(key1) is None
+    memcache.set(key1, data1)
+    assert memcache.get(key1) == data1
+    assert memcache.set(key1, data1, timeout)
+    time.sleep(timeout + timeout_tolerance)
+    assert memcache.get(key1) is None

tests/e2e/tests/ndb_test.py

@@ -1,22 +1,36 @@
-import os
-import pytest
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
 
 from google.appengine.ext.ndb import model, tasklets
+import pytest
+
 
 class Employee(model.Model):
-  name = model.StringProperty()
-  age = model.IntegerProperty()
+    name = model.StringProperty()
+    age = model.IntegerProperty()
 
 
 @pytest.fixture
 def ctx():
-  ctx = tasklets.get_context()
-  ctx.set_cache_policy(False)
-  ctx.set_memcache_policy(False)
-  return ctx
+    ctx = tasklets.get_context()
+    ctx.set_cache_policy(False)
+    ctx.set_memcache_policy(False)
+    return ctx
+
 
 def test_basics(ctx):
-  worker = Employee(name='Alice', age=55)
-  key = worker.put()
-  same_worker = key.get()
-  assert worker == same_worker
+    worker = Employee(name='Alice', age=55)
+    key = worker.put()
+    same_worker = key.get()
+    assert worker == same_worker

tests/e2e/tests/sanity_test.py

@@ -1,3 +1,16 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
 
 
 def test_sanity():

tests/e2e/tests/search_test.py

@@ -1,22 +1,40 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
 from google.appengine.api import search
 import pytest
-import time
+
 
 @pytest.fixture
 def index():
-  index = search.Index(name='simple-index', namespace='')
-  doc = search.Document(doc_id='test_id', fields=[
-      search.TextField(name='body', value='hello world'),
-  ])
-  index.put(doc)
-  return index
+    index = search.Index(name='simple-index', namespace='')
+    doc = search.Document(
+        doc_id='test_id',
+        fields=[
+            search.TextField(
+                name='body',
+                value='hello world'),
+        ])
+    index.put(doc)
+    return index
 
 
 def test_basic_search(index):
-  resp = index.search('hello')
-  assert len(resp.results) == 1
-  result = resp.results[0]
-  assert result.doc_id == 'test_id'
-  assert result.language == 'en'
-  assert result.fields[0].value == 'hello world'
-  assert result.fields[0].name == 'body'
+    resp = index.search('hello')
+    assert len(resp.results) == 1
+    result = resp.results[0]
+    assert result.doc_id == 'test_id'
+    assert result.language == 'en'
+    assert result.fields[0].value == 'hello world'
+    assert result.fields[0].name == 'body'

tests/e2e/tests/urlfetch_test.py

@@ -1,10 +1,23 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
 from google.appengine.api import urlfetch
-import pytest
-import time
 
 url = 'http://www.google.com'
 
+
 def test_urlfetch():
-  resp = urlfetch.fetch(url)
-  assert resp.status_code == 200
-  assert resp.headers['content-length'] == str(len(resp.content))
+    resp = urlfetch.fetch(url)
+    assert resp.status_code == 200
+    assert resp.headers['content-length'] == str(len(resp.content))