Merge pull request #63 from kontsaki/drop_py27_more

Drop py27 more

Author: goodboy

.gitignore

@@ -43,6 +43,9 @@ nosetests.xml
 coverage.xml
 *,cover
 
+# virtual environment
+venv
+
 # Translations
 *.mo
 *.pot

pysipp/agent.py

@@ -18,6 +18,7 @@
 
 SocketAddr = namedtuple('SocketAddr', 'ip port')
 
+DEFAULT_RUNNER_TIMEOUT = 180
 
 def tuple_property(attrs):
     def getter(self):
@@ -27,7 +28,6 @@ def getter(self):
         return None
 
     def setter(self, pair):
-
         if not isinstance(pair, tuple):
             if pair is None:
                 pair = (None, None)
@@ -269,6 +269,7 @@ def __init__(
 
         # agents iterable in launch-order
         self._agents = agents
+        self._prepared_agents = None
         ua_attrs = UserAgent.keys()
 
         # default settings
@@ -444,13 +445,27 @@ def from_agents(self, agents=None, autolocalsocks=True, **scenkwargs):
 
     async def arun(
         self,
-        timeout=180,
+        timeout=DEFAULT_RUNNER_TIMEOUT,
         runner=None,
+        block=True,
     ):
-        agents = self.prepare()
-        runner = runner or launch.TrioRunner()
+        self._prepared_agents = agents = self.prepare()
+        self._runner = runner = runner or launch.TrioRunner()
 
-        return await launch.run_all_agents(runner, agents, timeout=timeout)
+        return await launch.run_all_agents(runner, agents, timeout=timeout, block=block)
+
+    def finalize(self, *, timeout=DEFAULT_RUNNER_TIMEOUT):
+        assert (
+            self._prepared_agents and self._runner
+        ), "Must run scenario before finalizing."
+        return trio.run(
+            partial(
+                launch.finalize,
+                self._runner,
+                self._prepared_agents,
+                timeout=timeout,
+            )
+        )
 
     def run(
         self,

pysipp/launch.py

@@ -56,8 +56,7 @@ async def run(
         for cmd in cmds:
             log.debug(
                 "launching cmd:\n\"{}\"\n".format(cmd))
-            # proc = await trio.open_process(
-            proc = trio.Process(
+            proc = await trio.open_process(
                 shlex.split(cmd),
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.PIPE
@@ -157,32 +156,32 @@ def clear(self):
         self._procs.clear()
 
 
-async def run_all_agents(runner, agents, timeout=180):
-    """Run a sequencec of agents using a ``TrioRunner``.
-    """
-    async def finalize():
-        # this might raise TimeoutError
-        cmds2procs = await runner.get(timeout=timeout)
-        agents2procs = list(zip(agents, cmds2procs.values()))
-        msg = report.err_summary(agents2procs)
-        if msg:
-            # report logs and stderr
-            await report.emit_logfiles(agents2procs)
-            raise SIPpFailure(msg)
-
-        return cmds2procs
+async def run_all_agents(runner, agents, timeout=180, block=True):
+    """Run a sequencec of agents using a ``TrioRunner``."""
 
     try:
-        await runner.run(
-            (ua.render() for ua in agents),
-            timeout=timeout
-        )
-        await finalize()
+        await runner.run((ua.render() for ua in agents), timeout=timeout)
+        if block:
+            await finalize(runner, agents, timeout)
         return runner
     except TimeoutError as terr:
         # print error logs even when we timeout
         try:
-            await finalize()
+            await finalize(runner, agents, timeout)
         except SIPpFailure as err:
-            assert 'exit code -9' in str(err)
+            assert "exit code -9" in str(err)
             raise terr
+
+
+async def finalize(runner, agents, timeout):
+    """Block up to `timeout` seconds for all agents to complete."""
+    # this might raise TimeoutError
+    cmds2procs = await runner.get(timeout=timeout)
+    agents2procs = list(zip(agents, cmds2procs.values()))
+    msg = report.err_summary(agents2procs)
+    if msg:
+        # report logs and stderr
+        await report.emit_logfiles(agents2procs)
+        raise SIPpFailure(msg)
+
+    return cmds2procs

tests/test_agent.py

@@ -199,7 +199,6 @@ def test_pass_bad_socket_addr():
     with pytest.raises(ValueError):
         pysipp.client(proxyaddr='10.10.8.88')
 
-
 def test_authentication_arguments():
     client = agent.client(auth_username='username', auth_password='passw0rd')