Use tox commands to run interop client/server

mpwarres · Jan 7, 2016 · ccc1610 · ccc1610
1 parent 0467295
commit ccc1610
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
@@ -298,23 +298,17 @@ def __init__(self):
 
   def client_cmd(self, args):
     return [
-        '.tox/py27/bin/python',
-        'setup.py',
-        'run_interop',
-        '--client',
-        '--args=\'{}\''.format(' '.join(args))
+        'tox -einterop_client --',
+        ' '.join(args)
     ]
 
   def cloud_to_prod_env(self):
     return {}
 
   def server_cmd(self, args):
     return [
-        '.tox/py27/bin/python',
-        'setup.py',
-        'run_interop',
-        '--server',
-        '--args=\'{}\''.format(' '.join(args) + ' --use_tls=true')
+        'tox -einterop_server --',
+        ' '.join(args) + ' --use_tls=true'
     ]
 
   def global_env(self):

diff --git a/tox.ini b/tox.ini
@@ -16,3 +16,11 @@ commands =
 deps =
     -rrequirements.txt
 passenv = *
+
+[testenv:interop_client]
+commands =
+    {envpython} setup.py run_interop --client --args='{posargs}'
+
+[testenv:interop_server]
+commands =
+    {envpython} setup.py run_interop --server --args='{posargs}'