Browse Source

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.
Taylor Yu 6 years ago
parent
commit
44e4a96bb5
2 changed files with 9 additions and 1 deletions
  1. 4 0
      changes/bug23758
  2. 5 1
      src/test/test_config.c

+ 4 - 0
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.

+ 5 - 1
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);