test data dir migration

2019-09-09 16:37:59 -07:00
parent d8cb100fc0
commit 6f53723169
5 changed files with 85 additions and 6 deletions
@@ -343,7 +343,7 @@ function validateEnv(env) {
 }

 function validateDataDir(dataDir) {
-    if (dataDir === '') return null; // revert back to default dataDir
+    if (dataDir === null) return null;

    if (path.resolve(dataDir) !== dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir must be an absolute path', { field: 'dataDir' });

@@ -1155,7 +1155,7 @@ function setLocation(appId, data, auditSource, callback) {

 function setDataDir(appId, dataDir, auditSource, callback) {
    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof dataDir, 'string');
+    assert(dataDir === null || typeof dataDir === 'string');
    assert.strictEqual(typeof auditSource, 'object');
    assert.strictEqual(typeof callback, 'function');