TO SQUASH: Review comments

Author: dhermes

system_tests/run_emulator.py

@@ -115,24 +115,6 @@ def wait_ready_prefix(popen, prefix):
         emulator_ready = popen.stderr.readline().startswith(prefix)
 
 
-def pubsub_wait_ready(popen):
-    """Wait until the Pub / Sub emulator is ready to use.
-
-    :type popen: :class:`subprocess.Popen`
-    :param popen: An open subprocess to interact with.
-    """
-    wait_ready_prefix(popen, _PS_READY_LINE_PREFIX)
-
-
-def bigtable_wait_ready(popen):
-    """Wait until the Bigtable emulator is ready to use.
-
-    :type popen: :class:`subprocess.Popen`
-    :param popen: An open subprocess to interact with.
-    """
-    wait_ready_prefix(popen, _BT_READY_LINE_PREFIX)
-
-
 def wait_ready(package, popen):
     """Wait until the emulator is ready to use.
 
@@ -148,9 +130,9 @@ def wait_ready(package, popen):
     if package == DATASTORE:
         datastore_wait_ready(popen)
     elif package == PUBSUB:
-        pubsub_wait_ready(popen)
+        wait_ready_prefix(popen, _PS_READY_LINE_PREFIX)
     elif package == BIGTABLE:
-        bigtable_wait_ready(popen)
+        wait_ready_prefix(popen, _BT_READY_LINE_PREFIX)
     else:
         raise KeyError('Package not supported', package)
 

tox.ini

@@ -112,33 +112,34 @@ commands =
     python {toxinidir}/system_tests/attempt_system_tests.py {posargs}
 passenv = {[testenv:system-tests]passenv}
 
-[testenv:datastore-emulator]
-basepython =
-    python2.7
-commands =
-    python {toxinidir}/system_tests/run_emulator.py --package=datastore
+[emulator]
+deps =
+    {[testenv]deps}
+    psutil
 setenv =
     GOOGLE_CLOUD_NO_PRINT=true
 passenv =
     GOOGLE_CLOUD_DISABLE_GRPC
-deps =
-    {[testenv]deps}
-    psutil
+emulatorcmd =
+    python {toxinidir}/system_tests/run_emulator.py
+
+[testenv:datastore-emulator]
+commands =
+    {[emulator]emulatorcmd} --package=datastore
+setenv = {[emulator]setenv}
+passenv = {[emulator]passenv}
+deps = {[emulator]deps}
 
 [testenv:pubsub-emulator]
-basepython =
-    python2.7
 commands =
-    python {toxinidir}/system_tests/run_emulator.py --package=pubsub
-passenv =
-    GOOGLE_CLOUD_DISABLE_GRPC
-deps = {[testenv:datastore-emulator]deps}
+    {[emulator]emulatorcmd} --package=pubsub
+setenv = {[emulator]setenv}
+passenv = {[emulator]passenv}
+deps = {[emulator]deps}
 
 [testenv:bigtable-emulator]
-basepython =
-    python2.7
 commands =
-    python {toxinidir}/system_tests/run_emulator.py --package=bigtable
-passenv =
-    GOOGLE_CLOUD_DISABLE_GRPC
-deps = {[testenv:datastore-emulator]deps}
+    {[emulator]emulatorcmd} --package=bigtable
+setenv = {[emulator]setenv}
+passenv = {[emulator]passenv}
+deps = {[emulator]deps}