Merge pull request 'dev' (#5) from dev into master

Reviewed-on: https://chacha.ddns.net/gitea/chacha/dabdatasync/pulls/5
new-tag:0.4

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>{{project_name}}</name>
+	<name>dabdatasync</name>
 	<comment></comment>
 	<projects>
 	</projects>

Jenkinsfile

@@ -184,7 +184,7 @@ pipeline {
                 sh("virtualenv --pip=embed --setuptools=embed --wheel=embed --no-periodic-update --activators bash,python TOOLS_ENV")
 				
 				sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade setuptools build pip")
-                sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade 'copier==9.*' jinja2-slug toml")
+                sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade 'copier==8.*' jinja2-slug toml")
                  
                 sh(". ~/TEST_ENV/bin/activate && pip install --upgrade pip")
 				
@@ -546,7 +546,7 @@ pipeline {
                     dir("gitrepo") {
     				    junit 'helpers-results/cl_unit_test/*.xml'
     				    // using cobertura format (= coverage xml format)
-    				    recordCoverage(tools: [[parser: 'COBERTURA', pattern: 'helpers-results/cl_unit_test_coverage/test_coverage.xml']])
+    				    publishCoverage adapters: [cobertura(mergeToOneReport: true, path: "helpers-results/cl_unit_test_coverage/test_coverage.xml")]
     				    publishHTML([
                                     reportDir:              "helpers-results/cl_unit_test_coverage",
                                     reportFiles:            "index.html",

test/test_datasync.py

@@ -355,26 +355,6 @@ class TestDabDataSync(unittest.TestCase):
         with open(testdir_path / "test_data2" / "SAVE_FILE.txt", "rt", encoding="utf-8") as testfile:
             self.assertEqual(testfile.read(), "MODIFIED_VALUE")
 
-    def test_load_remote_empty(self):
-        dabdatasync.DataSync_Factory.manifest_path = testdir_path / "test_manifest_nextcloud.json"
-        datasync = dabdatasync.DataSync_Factory.get_DataSync()
-
-        datasync[0].wipe_remote_data()
-
-        with open(testdir_path / "test_data" / "SAVE_FILE.txt", "rt", encoding="utf-8") as testfile:
-            self.assertEqual(testfile.read(), "SAVED_VALUE")
-
-        with open(testdir_path / "test_data2" / "SAVE_FILE.txt", "rt", encoding="utf-8") as testfile:
-            self.assertEqual(testfile.read(), "SAVED_VALUE")
-
-        datasync[0].pull_data()
-
-        with open(testdir_path / "test_data" / "SAVE_FILE.txt", "rt", encoding="utf-8") as testfile:
-            self.assertEqual(testfile.read(), "SAVED_VALUE")
-
-        with open(testdir_path / "test_data2" / "SAVE_FILE.txt", "rt", encoding="utf-8") as testfile:
-            self.assertEqual(testfile.read(), "SAVED_VALUE")
-
     def load_nextcloud_gen(self, compressor):
         dabdatasync.DataSync_Factory.manifest_path = testdir_path / "test_manifest_nextcloud.json"
         datasync = dabdatasync.DataSync_Factory.get_DataSync()

test/test_manifest_nextcloud.json

@@ -178,6 +178,18 @@
             "type": "BOOL",
             "value": true
         },
+        "FSSYNC_INITIAL_FETCH": {
+            "type": "BOOL",
+            "value": true
+        },
+        "FSSYNC_POSTSYNC_CMD": {
+            "type": "STRING",
+            "value": ""
+        },
+        "FSSYNC_PRESYNC_CMD": {
+            "type": "STRING",
+            "value": ""
+        },
         "FSSYNC_RECORD": {
             "type": "T_ARRAY_FSSYNC_RECORD",
             "value": [