From 9e0d82f681f35ab0ae417b04e3e9096bd895d6b9 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 20 Mar 2018 15:48:33 +0000 Subject: [PATCH] Reduce the verbosity of test_store The travis logs are going above 4Mb causing the builds to fail. One test creates excessive output. This change reduces that output by approx 180k. [extended tests] Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5694) --- test/recipes/90-test_store.t | 71 +++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t index 2a6414bd88..d453512667 100644 --- a/test/recipes/90-test_store.t +++ b/test/recipes/90-test_store.t @@ -89,84 +89,89 @@ indir "store_$$" => sub { foreach (@noexist_files) { my $file = srctop_file($_); - ok(!run(app(["openssl", "storeutl", $file]))); - ok(!run(app(["openssl", "storeutl", to_abs_file($file)]))); + ok(!run(app(["openssl", "storeutl", "-noout", $file]))); + ok(!run(app(["openssl", "storeutl", "-noout", + to_abs_file($file)]))); { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(!run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); + ok(!run(app(["openssl", "storeutl", "-noout", + to_abs_file_uri($file)]))); } } foreach (@src_files) { my $file = srctop_file($_); - ok(run(app(["openssl", "storeutl", $file]))); - ok(run(app(["openssl", "storeutl", to_abs_file($file)]))); + ok(run(app(["openssl", "storeutl", "-noout", $file]))); + ok(run(app(["openssl", "storeutl", "-noout", to_abs_file($file)]))); { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); - ok(run(app(["openssl", "storeutl", + ok(run(app(["openssl", "storeutl", "-noout", + to_abs_file_uri($file)]))); + ok(run(app(["openssl", "storeutl", "-noout", to_abs_file_uri($file, 0, "")]))); - ok(run(app(["openssl", "storeutl", + ok(run(app(["openssl", "storeutl", "-noout", to_abs_file_uri($file, 0, "localhost")]))); - ok(!run(app(["openssl", "storeutl", + ok(!run(app(["openssl", "storeutl", "-noout", to_abs_file_uri($file, 0, "dummy")]))); } } foreach (@generated_files) { - ok(run(app(["openssl", "storeutl", "-passin", "pass:password", - $_]))); - ok(run(app(["openssl", "storeutl", "-passin", "pass:password", - to_abs_file($_)]))); + ok(run(app(["openssl", "storeutl", "-noout", "-passin", + "pass:password", $_]))); + ok(run(app(["openssl", "storeutl", "-noout", "-passin", + "pass:password", to_abs_file($_)]))); { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(run(app(["openssl", "storeutl", "-passin", "pass:password", - to_abs_file_uri($_)]))); - ok(!run(app(["openssl", "storeutl", "-passin", "pass:password", - to_file_uri($_)]))); + ok(run(app(["openssl", "storeutl", "-noout", "-passin", + "pass:password", to_abs_file_uri($_)]))); + ok(!run(app(["openssl", "storeutl", "-noout", "-passin", + "pass:password", to_file_uri($_)]))); } } foreach (values %generated_file_files) { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(run(app(["openssl", "storeutl", $_]))); + ok(run(app(["openssl", "storeutl", "-noout", $_]))); } foreach (@noexist_file_files) { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(!run(app(["openssl", "storeutl", $_]))); + ok(!run(app(["openssl", "storeutl", "-noout", $_]))); } { my $dir = srctop_dir("test", "certs"); - ok(run(app(["openssl", "storeutl", $dir]))); - ok(run(app(["openssl", "storeutl", to_abs_file($dir, 1)]))); + ok(run(app(["openssl", "storeutl", "-noout", $dir]))); + ok(run(app(["openssl", "storeutl", "-noout", + to_abs_file($dir, 1)]))); { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; - ok(run(app(["openssl", "storeutl", to_abs_file_uri($dir, 1)]))); + ok(run(app(["openssl", "storeutl", "-noout", + to_abs_file_uri($dir, 1)]))); } } - ok(!run(app(['openssl', 'storeutl', + ok(!run(app(['openssl', 'storeutl', '-noout', '-subject', '/C=AU/ST=QLD/CN=SSLeay\/rsa test cert', srctop_file('test', 'testx509.pem')])), "Checking that -subject can't be used with a single file"); - ok(run(app(['openssl', 'storeutl', '-certs', + ok(run(app(['openssl', 'storeutl', '-certs', '-noout', srctop_file('test', 'testx509.pem')])), "Checking that -certs returns 1 object on a certificate file"); - ok(run(app(['openssl', 'storeutl', '-certs', + ok(run(app(['openssl', 'storeutl', '-certs', '-noout', srctop_file('test', 'testcrl.pem')])), "Checking that -certs returns 0 objects on a CRL file"); - ok(run(app(['openssl', 'storeutl', '-crls', + ok(run(app(['openssl', 'storeutl', '-crls', '-noout', srctop_file('test', 'testx509.pem')])), "Checking that -crls returns 0 objects on a certificate file"); - ok(run(app(['openssl', 'storeutl', '-crls', + ok(run(app(['openssl', 'storeutl', '-crls', '-noout', srctop_file('test', 'testcrl.pem')])), "Checking that -crls returns 1 object on a CRL file"); @@ -177,24 +182,24 @@ indir "store_$$" => sub { # '/C=AU/ST=QLD/CN=SSLeay\/rsa test cert' # issuer from testcrl.pem: # '/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority' - ok(run(app(['openssl', 'storeutl', + ok(run(app(['openssl', 'storeutl', '-noout', '-subject', '/C=AU/ST=QLD/CN=SSLeay\/rsa test cert', catdir(curdir(), 'rehash')]))); - ok(run(app(['openssl', 'storeutl', + ok(run(app(['openssl', 'storeutl', '-noout', '-subject', '/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority', catdir(curdir(), 'rehash')]))); - ok(run(app(['openssl', 'storeutl', '-certs', + ok(run(app(['openssl', 'storeutl', '-noout', '-certs', '-subject', '/C=AU/ST=QLD/CN=SSLeay\/rsa test cert', catdir(curdir(), 'rehash')]))); - ok(run(app(['openssl', 'storeutl', '-crls', + ok(run(app(['openssl', 'storeutl', '-noout', '-crls', '-subject', '/C=AU/ST=QLD/CN=SSLeay\/rsa test cert', catdir(curdir(), 'rehash')]))); - ok(run(app(['openssl', 'storeutl', '-certs', + ok(run(app(['openssl', 'storeutl', '-noout', '-certs', '-subject', '/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority', catdir(curdir(), 'rehash')]))); - ok(run(app(['openssl', 'storeutl', '-crls', + ok(run(app(['openssl', 'storeutl', '-noout', '-crls', '-subject', '/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority', catdir(curdir(), 'rehash')]))); -- 2.25.1