]> granicus.if.org Git - graphviz/commitdiff
test_tools: remove now obsolete workaround for flaky lneato usage
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Sun, 16 Jan 2022 12:24:46 +0000 (13:24 +0100)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Mon, 17 Jan 2022 16:37:35 +0000 (17:37 +0100)
rtest/test_tools.py

index 1cfcca858465eaa63d6aed2af12c4f477a2830e7..f7015d3ceadfafe93e665633c8d31ab03b4c3d5c 100644 (file)
@@ -89,28 +89,6 @@ def test_tools(tool):
     output, _ = p.communicate()
     ret = p.returncode
 
-  # FIXME: https://gitlab.com/graphviz/graphviz/-/issues/1934
-  # cope with flaky failures, while also failing if this flakiness has been
-  # fixed
-  if tool == "lneato" and os.getenv("build_system") == "msbuild":
-    has_pass = ret == 0
-    has_fail = ret != 0
-    for _ in range(100):
-      if has_pass and has_fail:
-        break
-      with subprocess.Popen([tool, "-?"], env=environ_copy,
-                            stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                            stderr=subprocess.STDOUT,
-                            universal_newlines=True) as p:
-        out, _ = p.communicate()
-        if p.returncode == 0:
-          has_pass = True
-          ret = p.returncode
-          output = out
-        else:
-          has_fail = True
-    assert has_pass, "could not find passing execution"
-
   assert ret == 0, f"`{tool} -?` failed. Output was: {output}"
 
   assert re.match("usage", output, flags=re.IGNORECASE) is not None, \