Skip to content
This repository was archived by the owner on Apr 13, 2019. It is now read-only.

Commit 1949985

Browse files
author
Glenn Scott
committed
Merge pull request #6 from quevedo/master
Fix test_metis_ConfigurationFile failure as root
2 parents c229d0a + c739c07 commit 1949985

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ccnx/forwarder/metis/config/test/test_metis_ConfigurationFile.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,12 @@ LONGBOW_TEST_CASE(Create, metisConfigurationFile_Create_CantRead)
130130
chmod(template, 0600);
131131
unlink(template);
132132

133-
assertNull(cf, "Should have returned null configuration file for non-readable file");
133+
uid_t uid = getuid(), euid = geteuid();
134+
if (uid <= 0 || uid != euid) {
135+
metisConfigurationFile_Release(&cf);
136+
} else {
137+
assertNull(cf, "Should have returned null configuration file for non-readable file");
138+
}
134139

135140
metisForwarder_Destroy(&metis);
136141
close(fd);

0 commit comments

Comments
 (0)