From 7814cdf3ebc0bae649cc46f279ac4e4369d309de Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 27 Mar 2018 22:37:19 +0100 Subject: [PATCH] Revert "Temporarily disable some tests that hang" This reverts commit 37a385956461ab526ecea2739a8a40364a8db259. These tests should now be fixed by commit e6e9170d6. Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/5765) --- test/recipes/99-test_fuzz.t | 4 ---- util/perl/TLSProxy/Proxy.pm | 5 ----- 2 files changed, 9 deletions(-) diff --git a/test/recipes/99-test_fuzz.t b/test/recipes/99-test_fuzz.t index 02fa140573..9322ff7790 100644 --- a/test/recipes/99-test_fuzz.t +++ b/test/recipes/99-test_fuzz.t @@ -15,10 +15,6 @@ use OpenSSL::Test::Utils; setup("test_fuzz"); -# TODO vvvv Remove this line -plan skip_all => "TLSProxy isn't usable on $^O"; -# TODO ^^^^ Remove this line - my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'client', 'conf', 'crl', 'server', 'x509'); if (!disabled("cms")) { push @fuzzers, 'cms'; diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm index 55d45a8876..0b90159811 100644 --- a/util/perl/TLSProxy/Proxy.pm +++ b/util/perl/TLSProxy/Proxy.pm @@ -68,11 +68,6 @@ sub new message_list => [], }; - ### TODO vvvv REMOVE THIS AGAIN - warn "Proxy tests temporarily disabled!\n"; - $self->{proxy_sock} = 0; - return bless $self, $class; - ### TODO ^^^^ REMOVE THIS AGAIN # IO::Socket::IP is on the core module list, IO::Socket::INET6 isn't. # However, IO::Socket::INET6 is older and is said to be more widely # deployed for the moment, and may have less bugs, so we try the latter -- 2.25.1