diff options
| author | Taylor Yu <catalyst@torproject.org> | 2017-10-04 08:42:05 -0500 |
|---|---|---|
| committer | Taylor Yu <catalyst@torproject.org> | 2017-10-04 08:42:05 -0500 |
| commit | 44e4a96bb5d2a01d57084ec8beb14e4518644614 (patch) | |
| tree | 760a1a6ddec8ab00b395cdaaa51631fd86f7701d | |
| parent | 55e5446f8dfdb8606310041567c06ccaf9c0d80a (diff) | |
| download | tor-44e4a96bb5d2a01d57084ec8beb14e4518644614.tar.gz tor-44e4a96bb5d2a01d57084ec8beb14e4518644614.zip | |
Don't expect permission failure if running as root
Skip test_config_include_no_permission() when running as root, because
it will get an unexpected success from config_get_lines_include().
This affects some continuous integration setups. Fixes bug 23758.
| -rw-r--r-- | changes/bug23758 | 4 | ||||
| -rw-r--r-- | src/test/test_config.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug23758 b/changes/bug23758 new file mode 100644 index 0000000000..565791e8f4 --- /dev/null +++ b/changes/bug23758 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Skip a test that would fail if run as root (because it expects a + permissions error). This affects some continuous integration setups. + Fixes bug 23758; bugfix on 0.3.2.2-alpha. diff --git a/src/test/test_config.c b/src/test/test_config.c index e9cdf9ddb1..b035070a10 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4957,7 +4957,11 @@ test_config_include_no_permission(void *data) config_line_t *result = NULL; char *folder_path = NULL; - char *dir = tor_strdup(get_fname("test_include_forbidden_folder")); + char *dir = NULL; + if (geteuid() == 0) + tt_skip(); + + dir = tor_strdup(get_fname("test_include_forbidden_folder")); tt_ptr_op(dir, OP_NE, NULL); tt_int_op(mkdir(dir, 0700), OP_EQ, 0); |