The branch master has been updated
via e008d1b2672f0ab6d64ab1afd20a903678bd8ed2 (commit)
from 88f84eb25728a7b4c0b9f684198fd541be9eebe3 (commit)
- Log -----------------------------------------------------------------
commit e008d1b2672f0ab6d64ab1afd20a903678bd8ed2
Author: Richard Levitte <[email protected]>
Date: Fri Sep 18 21:27:29 2015 +0200
Check if test_rehash is run as root
If test/recipes/40-test_rehash.t is executed as root, the last test
will fail, since the created directory will remain writable no matter
what. Make sure it complains loudly about being run as root.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
test/recipes/40-test_rehash.t | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index 514d0d3..4f0d71f 100644
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -10,7 +10,7 @@ use OpenSSL::Test qw/:DEFAULT top_file/;
setup("test_rehash");
-plan tests => 4;
+plan tests => 5;
indir "rehash.$$" => sub {
prepare();
@@ -32,8 +32,15 @@ indir "rehash.$$" => sub {
indir "rehash.$$" => sub {
prepare();
chmod 0500, curdir();
- isnt(run(app(["openssl", "rehash", curdir()])), 1,
- 'Testing rehash operations on readonly directory');
+ SKIP: {
+ if (!ok(!open(FOO, ">unwritable.txt"),
+ "Testing that we aren't running as a priviledged user, such as
root")) {
+ close FOO;
+ skip "It's pointless to run the next test as root", 1;
+ }
+ isnt(run(app(["openssl", "rehash", curdir()])), 1,
+ 'Testing rehash operations on readonly directory');
+ }
chmod 0700, curdir(); # make it writable again, so cleanup works
}, create => 1, cleanup => 1;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
