Merge pull request #82 from GoogleCloudPlatform/e2e_test

Fixing the test harness to properly refresh test modules.

Author: bryanmau1

resources/gunicorn.conf.py

@@ -17,3 +17,6 @@
 
 # Settings specific to the Managed VMs production environment such as "bind"
 # and "logfile" are set in the Dockerfile's ENTRYPOINT directive.
+
+# Store the process ID of gunicorn.  Used for testing.
+pidfile = 'gunicorn_pid.txt'

tests/e2e/app/app.yaml.in

@@ -5,5 +5,8 @@ handlers:
 - url: .*
   script: main.app
 
+manual_scaling:
+  instances: 1
+
 env_variables:
   CLOUD_STORAGE_BUCKET: $CLOUD_STORAGE_BUCKET

tests/e2e/app/main.py

@@ -19,6 +19,7 @@
 import pytest
 import os
 import shutil
+import signal
 import sys
 import webapp2
 
@@ -37,21 +38,34 @@ def capture():
     finally:
         sys.stdout, sys.stderr = oldout, olderr
 
+class RefreshHandler(webapp2.RequestHandler):
 
-class TestRunnerHandler(webapp2.RequestHandler):
-
-    def get(self):
-        # Set up test directory.
-        if os.path.isdir('tests'):
+  def get(self):
+      # Set up test directory.
+      if os.path.isdir('tests'):
           shutil.rmtree('tests')
-        os.mkdir('tests')
+      os.mkdir('tests')
 
-        # Refresh the tests from cloud storage.
-        bucket = storage.Client().get_bucket(GCLOUD_STORAGE_BUCKET)
-        blob_iter = bucket.list_blobs()
-        for blob in blob_iter:
+      # Refresh the tests from cloud storage.
+      bucket = storage.Client().get_bucket(GCLOUD_STORAGE_BUCKET)
+      blob_iter = bucket.list_blobs()
+      for blob in blob_iter:
           blob.download_to_filename('tests/%s' % blob.name)
 
+      # Tell Gunicorn to refresh this process so that our modules
+      # will be refreshed with the new files.  The gunicorn process
+      # is stored in gunicorn_pid.txt.
+      with open('gunicorn_pid.txt') as f:
+          for line in f:
+              pid = int(line)
+
+      os.kill(pid, signal.SIGHUP)
+
+
+
+class TestRunnerHandler(webapp2.RequestHandler):
+
+    def get(self):
         # Run the tests.
         with capture() as outf:
             result = pytest.main(['tests'])
@@ -62,6 +76,9 @@ def get(self):
             self.response.status = 500
 
 
+
+
 app = webapp2.WSGIApplication([
-    ('/', TestRunnerHandler),
+    ('/refresh', RefreshHandler),
+    ('/test', TestRunnerHandler),
 ], debug=True)

tests/e2e/client/main.py

@@ -5,7 +5,8 @@
 
 
 def main(url):
-    response = requests.get(url)
+    requests.get(url + 'refresh')
+    response = requests.get(url + 'test')
 
     print(response.text)