Added mocks for the generated service objects. Also fixed a bunch of formatting.
diff --git a/tests/test_discovery.py b/tests/test_discovery.py
index 7d52b3d..44dbd6a 100644
--- a/tests/test_discovery.py
+++ b/tests/test_discovery.py
@@ -32,20 +32,7 @@
from cgi import parse_qs
from apiclient.discovery import build, key2param
-
-DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
-
-
-class HttpMock(object):
-
- def __init__(self, filename, headers):
- f = file(os.path.join(DATA_DIR, filename), 'r')
- self.data = f.read()
- f.close()
- self.headers = headers
-
- def request(self, uri, method="GET", body=None, headers=None, redirections=1, connection_type=None):
- return httplib2.Response(self.headers), self.data
+from tests.util import HttpMock
class Utilities(unittest.TestCase):