Merge branch '2.3' into develop

2019-05-02 20:24:04 +03:00
parent 3dd9298b18 09d04a09d4
commit 20afbfca76
5 changed files with 30 additions and 22 deletions
--- a/server/core/test/test_adminusers.cc
+++ b/server/core/test/test_adminusers.cc
@ -232,7 +232,7 @@ int main(int argc, char** argv)
    /** Set datadir to /tmp */
    set_datadir(MXS_STRDUP_A("/tmp"));

-    /* Unlink any existing password file before running this test */
+    /* Unlink any existing password files before running this test */
    sprintf(buf, "%s/maxadmin-users", get_datadir());
    if (!is_valid_posix_path(buf))
    {
@ -241,6 +241,14 @@ int main(int argc, char** argv)

    unlink(buf);

+    sprintf(buf, "%s/passwd", get_datadir());
+    if (!is_valid_posix_path(buf))
+    {
+        exit(1);
+    }
+
+    unlink(buf);
+
    admin_users_init();
    result += test1();
    result += test2();