fixed pep8

inmanta · Nov 7, 2018 · f1c5880 · f1c5880
1 parent 5214ff2
commit f1c5880
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/src/inmanta/agent/handler.py b/src/inmanta/agent/handler.py
@@ -28,7 +28,6 @@
 
 from inmanta.agent.io import get_io
 from inmanta import protocol, resources, const, data
-from tornado import ioloop
 from inmanta.module import Project
 from inmanta.agent.cache import AgentCache
 import uuid

diff --git a/src/inmanta/server/server.py b/src/inmanta/server/server.py
@@ -23,7 +23,6 @@
 import logging
 import os
 import re
-import subprocess
 import sys
 import tempfile
 import time
@@ -1483,9 +1482,13 @@ def _run_compile_stage(self, name, cmd, cwd, **kwargs):
             out.seek(0)
             err.seek(0)
 
+            errdata = err.read().decode()
+
+            LOGGER.debug(errdata)
+
             stop = datetime.datetime.now()
             return data.Report(started=start, completed=stop, name=name, command=" ".join(cmd),
-                               errstream=err.read().decode(), outstream=out.read().decode(), returncode=returncode)
+                               errstream=errdata, outstream=out.read().decode(), returncode=returncode)
 
         finally:
             out.close()
@@ -1530,12 +1533,14 @@ def _recompile_environment(self, environment_id, update_repo=False, wait=0, meta
 
             # verify if branch is correct
             LOGGER.debug("Verifying correct branch")
-            sub_process = process.Subprocess(["git", "branch"], stdout=process.Subprocess.STREAM, stderr=process.Subprocess.STREAM,
+            sub_process = process.Subprocess(["git", "branch"],
+                                             stdout=process.Subprocess.STREAM,
+                                             stderr=process.Subprocess.STREAM,
                                              cwd=project_dir)
 
-            out, log_err, returncode = yield [gen.Task(sub_process.stdout.read_until_close),
-                                              gen.Task(sub_process.stderr.read_until_close),
-                                              sub_process.wait_for_exit(raise_error=False)]
+            out, _, _ = yield [gen.Task(sub_process.stdout.read_until_close),
+                               gen.Task(sub_process.stderr.read_until_close),
+                               sub_process.wait_for_exit(raise_error=False)]
 
             o = re.search("\* ([^\s]+)$", out.decode(), re.MULTILINE)
             if o is not None and env.repo_branch != o.group(1):

diff --git a/tests/test_protocol.py b/tests/test_protocol.py
@@ -98,7 +98,7 @@ def do_test():
     thread.start()
 
     while len(done) == 0 and limit > 0:
-        yield gen.sleep(0.01)
+        yield gen.sleep(sleep)
         limit -= 1
 
     thread.join()

diff --git a/tests/test_server_agent.py b/tests/test_server_agent.py
@@ -2801,17 +2801,19 @@ def test_server_recompile(server_multi, client_multi, environment_multi):
     def wait_for_version(cnt):
         # Wait until the server is no longer compiling
         # wait for it to finish
+        yield gen.sleep(0.1)
         code = 200
         while code == 200:
             compiling = yield client.is_compiling(environment)
             code = compiling.code
-            yield gen.sleep(1)
-
+            yield gen.sleep(0.1)
         # wait for it to appear
         versions = yield client.list_versions(environment)
 
         while versions.result["count"] < cnt:
+            logger.info(versions.result)
             versions = yield client.list_versions(environment)
+            yield gen.sleep(0.1)
 
         return versions.result
 
@@ -2832,9 +2834,10 @@ def wait_for_version(cnt):
         std::ConfigFile(host=host, path="/etc/motd", content="1234")
 """)
 
-    # request a compile
+    logger.info("request a compile")
     yield client.notify_change(environment)
 
+    logger.info("wait for 1")
     versions = yield wait_for_version(1)
     assert versions["versions"][0]["total"] == 1
     assert versions["versions"][0]["version_info"]["export_metadata"]["type"] == "api"
@@ -2848,8 +2851,10 @@ def wait_for_version(cnt):
     versions = yield wait_for_version(1)
     assert versions["count"] == 1
 
+    logger.info("request second compile")
     # set a new parameter and request a recompile
     yield client.set_param(environment, id="param2", value="test", source="plugin", recompile=True)
+    logger.info("wait for 2")
     versions = yield wait_for_version(2)
     assert versions["versions"][0]["version_info"]["export_metadata"]["type"] == "param"
     assert versions["count"] == 2
@@ -2862,6 +2867,7 @@ def wait_for_version(cnt):
     # update the parameter to a new value
     yield client.set_param(environment, id="param2", value="test2", source="plugin", recompile=True)
     versions = yield wait_for_version(3)
+    logger.info("wait for 3")
     assert versions["count"] == 3