From eafcc51094dd81bfebce370bb41cad2acbe8c7b3 Mon Sep 17 00:00:00 2001
From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sun, 16 Jan 2022 13:24:46 +0100
Subject: [PATCH] test_tools: remove now obsolete workaround for flaky lneato
 usage

---
 rtest/test_tools.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/rtest/test_tools.py b/rtest/test_tools.py
index 1cfcca858..f7015d3ce 100644
--- a/rtest/test_tools.py
+++ b/rtest/test_tools.py
@@ -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, \
-- 
2.40.0