Skip to content

Commit c263cd4

Browse files
committed
Merge branch 'maint-3.0'
* maint-3.0: test/openssl/test_pkey.rb: allow failures in test_s_generate_parameters
2 parents 804356a + ccc1594 commit c263cd4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/openssl/test_pkey.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ def test_s_generate_parameters
4040
}
4141

4242
# Parameter generation callback is called
43+
if openssl?(3, 0, 0, 0) && !openssl?(3, 0, 0, 6)
44+
# Errors in BN_GENCB were not properly handled. This special pend is to
45+
# suppress failures on Ubuntu 22.04, which uses OpenSSL 3.0.2.
46+
pend "unstable test on OpenSSL 3.0.[0-5]"
47+
end
4348
cb_called = []
4449
assert_raise(RuntimeError) {
4550
OpenSSL::PKey.generate_parameters("DSA") { |*args|
4651
cb_called << args
4752
raise "exit!" if cb_called.size == 3
4853
}
4954
}
50-
if !cb_called && openssl?(3, 0, 0) && !openssl?(3, 0, 6)
51-
# Errors in BN_GENCB were not properly handled. This special pend is to
52-
# suppress failures on Ubuntu 22.04, which uses OpenSSL 3.0.2.
53-
pend "unstable test on OpenSSL 3.0.[0-5]"
54-
end
5555
assert_not_empty cb_called
5656
end
5757

0 commit comments

Comments
 (0)