From: Magnus Jacobsson Date: Fri, 11 Sep 2020 06:50:27 +0000 (+0200) Subject: Restore whitespace and comment after earlier bad merge conflict resolution X-Git-Tag: 2.46.0~20^2^2~15^2~22 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebec73a11b39ad74e6aab73999e2a5a6ba3b7704;p=graphviz Restore whitespace and comment after earlier bad merge conflict resolution --- diff --git a/rtest/test_regression.py b/rtest/test_regression.py index cc19419e0..51032d06e 100644 --- a/rtest/test_regression.py +++ b/rtest/test_regression.py @@ -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',