updated tests

Author: Bryan Mau

tests/e2e/tests/logging_test.py

@@ -1,13 +1,9 @@
-"""E2E test for logging API.
-
-Currently DOES NOT work.
-"""
+from google.appengine.api.logservice import logservice
 import json
 import logging
 import os
 import pytest
 
-from google.appengine.api.logservice import logservice
 
 
 @pytest.fixture

tests/e2e/tests/memcache_test.py

@@ -1,36 +1,16 @@
-"""Tests for the memcache API."""
-
+from google.appengine.api import memcache
 import pytest
 import time
 
-from google.appengine.api import memcache
-
-
-@pytest.fixture
-def defaults():
-  memcache.flush_all()
-  return {
-      'client': memcache._CLIENT,
-      'mapping': {
-          'key1', 'data1',
-          'key2', 'data2',
-          'key3', 'data3',
-      },
-      'timeout': 2,
-      'timeout_tolerance': 2,
-      'namespace1': 'foo',
-      'namespace2': 'bar',
-      'default_range': 10,
-      'default_incr_start': 1,
-      'default_decr_start': 1000,
-      'default_delta': 10,
-  }
-
+key1 = 'key1'
+data1 = 'data1'
+timeout = 2
+timeout_tolerance = 2
 
-def test_memcache(defaults):
-  assert memcache.get('key1') == None
-  memcache.set('key1', 'data1')
-  assert memcache.get('key1') == 'data1'
-  assert memcache.set('key1', 'data1', defaults['timeout'])
-  time.sleep(defaults['timeout'] + defaults['timeout_tolerance'])
-  assert memcache.get('key1') == None
+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

tests/e2e/tests/search_test.py

@@ -1,11 +1,7 @@
-"""Tests for the search API."""
-
+from google.appengine.api import search
 import pytest
 import time
 
-from google.appengine.api import search
-
-
 @pytest.fixture
 def index():
   index = search.Index(name='simple-index', namespace='')

tests/e2e/tests/urlfetch_test.py

@@ -1,16 +1,10 @@
-"""Tests for the urlfetch API."""
-
+from google.appengine.api import urlfetch
 import pytest
 import time
 
-from google.appengine.api import urlfetch
-
-
-@pytest.fixture
-def url():
-  return 'http://www.google.com'
+url = 'http://www.google.com'
 
-def test_urlfetch(url):
+def test_urlfetch():
   resp = urlfetch.fetch(url)
   assert resp.status_code == 200
   assert resp.headers['content-length'] == str(len(resp.content))

tests/e2e/tests/users_test.py

@@ -1,12 +1,7 @@
-"""E2E test for Users API."""
-import pytest
-
 from google.appengine.api import users
+import pytest
 
+user = users.get_current_user()
 
-@pytest.fixture
-def user():
-  return users.get_current_user()
-
-def test_current_user(user):
+def test_current_user():
   assert user == None