Fix missing data path issue (#1180)

tests/test_base/test_base_common.py

@@ -33,7 +33,8 @@ from novelwriter.common import (
     isTitleTag, isItemClass, isItemType, isItemLayout, hexToInt, checkIntRange,
     minmax, checkIntTuple, formatInt, formatTimeStamp, formatTime, simplified,
     splitVersionNumber, transferCase, fuzzyTime, numberToRoman, jsonEncode,
-    readTextFile, makeFileNameSafe, sha256sum, getGuiItem, NWConfigParser
+    readTextFile, makeFileNameSafe, ensureFolder, sha256sum, getGuiItem,
+    NWConfigParser
 )
 
 
@@ -541,6 +542,32 @@ def testBaseCommon_MakeFileNameSafe():
 # END Test testBaseCommon_MakeFileNameSafe
 
 
+@pytest.mark.base
+def testBaseCommon_EnsureFolder(monkeypatch, fncDir):
+    """Test the ensureFolder function.
+    """
+    newDir1 = os.path.join(fncDir, "newDir1")
+    newDir2 = os.path.join(fncDir, "newDir2")
+    newDir3 = os.path.join(fncDir, "newDir3")
+
+    assert ensureFolder(None) is False
+
+    assert ensureFolder(newDir1) is True
+    assert os.path.isdir(newDir1)
+
+    assert ensureFolder("newDir2", parentPath=fncDir) is True
+    assert os.path.isdir(newDir2)
+
+    with monkeypatch.context() as mp:
+        mp.setattr("os.mkdir", causeOSError)
+        errLog = []
+        assert ensureFolder("newDir3", parentPath=fncDir, errLog=errLog) is False
+        assert errLog[0] == f"Could not create folder: {newDir3}"
+        assert not os.path.isdir(newDir3)
+
+# END Test testBaseCommon_EnsureFolder
+
+
 @pytest.mark.base
 def testBaseCommon_Sha256Sum(monkeypatch, fncDir, ipsumText):
     """Test the sha256sum function.

tests/test_base/test_base_config.py

@@ -316,38 +316,6 @@ def testBaseConfig_RecentCache(monkeypatch, tmpConf, tmpDir, fncDir):
 # END Test testBaseConfig_RecentCache
 
 
-@pytest.mark.base
-def testBaseConfig_SetPath(tmpConf, tmpDir):
-    """Test path setters.
-    """
-    # Conf Path
-    assert tmpConf.setConfPath(None)
-    assert not tmpConf.setConfPath(os.path.join("somewhere", "over", "the", "rainbow"))
-    assert tmpConf.setConfPath(os.path.join(tmpDir, "novelwriter.conf"))
-    assert tmpConf.confPath == tmpDir
-    assert tmpConf.confFile == "novelwriter.conf"
-    assert not tmpConf.confChanged
-
-    # Data Path
-    assert tmpConf.setDataPath(None)
-    assert not tmpConf.setDataPath(os.path.join("somewhere", "over", "the", "rainbow"))
-    assert tmpConf.setDataPath(tmpDir)
-    assert tmpConf.dataPath == tmpDir
-    assert not tmpConf.confChanged
-
-    # Last Path
-    assert tmpConf.setLastPath(None)
-    assert tmpConf.lastPath == ""
-
-    assert tmpConf.setLastPath(os.path.join(tmpDir, "file.tmp"))
-    assert tmpConf.lastPath == tmpDir
-
-    assert tmpConf.setLastPath("")
-    assert tmpConf.lastPath == ""
-
-# END Test testBaseConfig_SetPath
-
-
 @pytest.mark.base
 def testBaseConfig_SettersGetters(tmpConf, tmpDir, outDir, refDir):
     """Set various sizes and positions