diff --git a/0001-disable-zmq-test.patch b/0001-disable-zmq-test.patch index 531c0c7..2798311 100644 --- a/0001-disable-zmq-test.patch +++ b/0001-disable-zmq-test.patch @@ -17,7 +17,7 @@ index 1f8ee5416..b298fe7b5 100644 - @pytest.mark.skipif('S["ZEROMQ_TRUE"]=""\n' not in open('../config.status').readlines(), - reason='ZEROMQ not enabled') -+ @pytest.mark.xfail(reason="Test disabled due to intermittent build service timeouts") ++ @pytest.mark.skip(reason="Test disabled due to intermittent build service timeouts") def test_refout(self): return super(TestZMQ, self).test_refout() -- diff --git a/frr.changes b/frr.changes index eafb3ba..c2bb64b 100644 --- a/frr.changes +++ b/frr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 23 03:05:06 UTC 2021 - Marius Tomaschewski + +- Use skip, not xfail in 0001-disable-zmq-test.patch to disable + zmq test as it is not expected to fail but hangs (bsc#1180217) + ------------------------------------------------------------------- Thu Mar 4 21:20:02 UTC 2021 - Martin Hauke