]> granicus.if.org Git - graphviz/commitdiff
Restore whitespace and comment after earlier bad merge conflict resolution
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Fri, 11 Sep 2020 06:50:27 +0000 (08:50 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Sat, 24 Oct 2020 05:46:23 +0000 (07:46 +0200)
rtest/test_regression.py

index cc19419e0104c1cb4348ec4218cf142c1f7888bc..51032d06e64918c5a30c7f074f45483553192e59 100644 (file)
@@ -332,7 +332,6 @@ def test_1783():
     assert ret != -signal.SIGSEGV, 'Graphviz segfaulted'
 
 # FIXME: Remove skip when
-
 # https://gitlab.com/graphviz/graphviz/-/issues/1816 is fixed
 @pytest.mark.skipif(
     os.environ.get('build_system') == 'cmake' or
@@ -353,6 +352,7 @@ def test_1813():
 
     assert 'Usage' in output, 'gvedit -? did not show usage'
 
+# FIXME: Remove skip when
 # https://gitlab.com/graphviz/graphviz/-/issues/1753 is fixed
 @pytest.mark.skipif(
     os.environ.get('build_system') == 'cmake',