From ccc1610b95bdb20a561246a7ce8a54bd5e2ea92b Mon Sep 17 00:00:00 2001
From: Masood Malekghassemi <soltanmm@users.noreply.github.com>
Date: Thu, 17 Dec 2015 14:32:44 -0800
Subject: [PATCH] Use tox commands to run interop client/server

---
 tools/run_tests/run_interop_tests.py | 14 ++++----------
 tox.ini                              |  8 ++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 1a806ab206ea8..40bbe3cc3ca0a 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -298,11 +298,8 @@ 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):
@@ -310,11 +307,8 @@ def cloud_to_prod_env(self):
 
   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
index f89f34e131907..a655935219f9c 100644
--- 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}'