[ARVADOS] updated: c0c045464f89f27460577279e3d8998e338904e8

[git at public.curoverse.com]

Summary of changes:
 sdk/python/tests/run_test_server.py | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

       via  c0c045464f89f27460577279e3d8998e338904e8 (commit)
      from  4ec7d62ef292dfaedd13de3acb41234672f09ecb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c0c045464f89f27460577279e3d8998e338904e8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Nov 10 10:03:04 2014 -0500

    Python run_test_server runs websockets separately non-SSL for compatibility
    with default application.yml.default.  refs #4084

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 82c6424..1624402 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -95,27 +95,19 @@ def run(websockets=False, reuse_server=False):
         subprocess.call(['bundle', 'exec', 'rake', 'db:test:load'])
         subprocess.call(['bundle', 'exec', 'rake', 'db:fixtures:load'])
 
+        subprocess.call(['bundle', 'exec', 'rails', 'server', '-d',
+                         '--pid',
+                         os.path.join(os.getcwd(), SERVER_PID_PATH),
+                         '-p3000'])
+        os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
+
         if websockets:
-            os.environ["ARVADOS_WEBSOCKETS"] = "true"
-            subprocess.call(['openssl', 'req', '-new', '-x509', '-nodes',
-                             '-out', './self-signed.pem',
-                             '-keyout', './self-signed.key',
-                             '-days', '3650',
-                             '-subj', '/CN=localhost'])
+            os.environ["ARVADOS_WEBSOCKETS"] = "ws-only"
             subprocess.call(['bundle', 'exec',
                              'passenger', 'start', '-d', '-p3333',
                              '--pid-file',
-                             os.path.join(os.getcwd(), WEBSOCKETS_SERVER_PID_PATH),
-                             '--ssl',
-                             '--ssl-certificate', 'self-signed.pem',
-                             '--ssl-certificate-key', 'self-signed.key'])
-            os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3333"
-        else:
-            subprocess.call(['bundle', 'exec', 'rails', 'server', '-d',
-                             '--pid',
-                             os.path.join(os.getcwd(), SERVER_PID_PATH),
-                             '-p3000'])
-            os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
+                             os.path.join(os.getcwd(), WEBSOCKETS_SERVER_PID_PATH)
+                         ])
 
         pid = find_server_pid(SERVER_PID_PATH)
 

-----------------------------------------------------------------------


hooks/post-receive
--