Merge pull request #115 from yili1992/master

fix(socketserver): current workdir be modified when loop =True

Author: nicoddemus

CHANGELOG.rst

@@ -2,6 +2,7 @@
 ------------------
 
 * Dropped support for Python 3.4.
+
 * `#118 <https://github.com/pytest-dev/execnet/pull/118>`__: Fixed internal leak that should make
   ``execnet`` execute remote code in the main thread more often; previously it would sometimes
   spawn a thread to execute a ``remote_exec`` call, even when the caller
@@ -10,6 +11,9 @@
   `pytest-dev/pytest-xdist#620 <https://github.com/pytest-dev/pytest-xdist/issues/620>`__
   for an example).
 
+* `#115 <https://github.com/pytest-dev/execnet/pull/115>`__: Current working directory is now
+  restored when calling ``script/socketserver.py``. The script now also loops by default
+  when called from the command-line.
 
 1.7.1 (2019-08-28)
 ------------------

execnet/script/socketserver.py

@@ -94,6 +94,7 @@ def bind_and_listen(hostport, execmodel):
 
 
 def startserver(serversock, loop=False):
+    execute_path = os.getcwd()
     try:
         while 1:
             try:
@@ -108,6 +109,7 @@ def startserver(serversock, loop=False):
                 else:
                     excinfo = sys.exc_info()
                     print_("got exception", excinfo[1])
+            os.chdir(execute_path)
             if not loop:
                 break
     finally:
@@ -126,7 +128,8 @@ def startserver(serversock, loop=False):
 
     execmodel = get_execmodel("thread")
     serversock = bind_and_listen(hostport, execmodel)
-    startserver(serversock, loop=False)
+    startserver(serversock, loop=True)
+
 elif __name__ == "__channelexec__":
     chan = globals()["channel"]
     execmodel = chan.gateway.execmodel