Add system test

client/client_daemon.py

@@ -200,7 +200,7 @@ def download_file(self, dst_path):
         local_path = get_abspath(dst_path)
 
         if r.status_code == requests.codes.ok:
-            return local_path, r.text
+            return local_path, r.content
         else:
             return False, False
 
@@ -899,13 +899,14 @@ def on_modified(self, event):
 class DirSnapshotManager(object):
     """This class has the responsibility to synchronize client and server"""
 
-    def __init__(self, snapshot_file_path):
+    def __init__(self, snapshot_file_path, share_path):
         """The constructor.
         It loads the last global snapshot and creates an instant snapshot
         of local directory.
         @param snapshot_file_path Path of the snapshot
         """
         self.snapshot_file_path = snapshot_file_path
+        self.share_path = share_path
         self.last_status = self._load_status()
         self.local_full_snapshot = self.instant_snapshot()
 
@@ -966,7 +967,7 @@ def instant_snapshot(self):
         @return The snapshot of the directory
         """
         dir_snapshot = {}
-        for root, dirs, files in os.walk(CONFIG_DIR_PATH):
+        for root, dirs, files in os.walk(self.share_path):
             for f in files:
                 full_path = os.path.join(root, f)
                 file_md5 = self.file_snapMd5(full_path)
@@ -1161,7 +1162,7 @@ def synchronize_dispatcher(self, server_timestamp, server_snapshot):
 
                 for equal_path in equal_paths:  # 2) b 2
                     if self.find_file_md5(
-                        self.local_full_snapshot, equal_path, False) != self.find_file_md5(server_snapshot, equal_path):
+                            self.local_full_snapshot, equal_path, False) != self.find_file_md5(server_snapshot, equal_path):
                         if self.check_files_timestamp(server_snapshot, equal_path):  # 2) b 2 I
                             logger.debug("server push:\t{}".format(equal_path))
                             command_list.append({'remote_upload': [equal_path]})
@@ -1264,15 +1265,16 @@ def args_parse_init(stdout_level, file_level):
     @param stdout_level
     @param file_level
     """
-    parser = argparse.ArgumentParser(description='RawBox client daemon', 
-                                     formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("--std-log-level", required=False, 
+    parser = argparse.ArgumentParser(
+        description='RawBox client daemon',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument("--std-log-level", required=False,
                         help="set the logging level to std out. this argument accept:\n\tDEBUG\n\tINFO\n\tWARNING\n\tERROR\n\tCRITICAL", default=stdout_level)
-    parser.add_argument("--file-log-level", required=False, 
+    parser.add_argument("--file-log-level", required=False,
                         help="set the logging level to file. this argument accept:\n\tDEBUG\n\tINFO\n\tWARNING\n\tERROR\n\tCRITICAL", default=file_level)
-    parser.add_argument("--no-log", action="store_true", required=False, 
+    parser.add_argument("--no-log", action="store_true", required=False,
                         help="disable all log", default=False)
-    parser.add_argument("--no-repo", action="store_true", required=False, 
+    parser.add_argument("--no-repo", action="store_true", required=False,
                         help="disable the creation of a crash file", default=False)
     args = parser.parse_args()
     return args
@@ -1301,6 +1303,7 @@ def main():
 
     snapshot_manager = DirSnapshotManager(
         snapshot_file_path=config['snapshot_file_path'],
+        share_path=config['dir_path']
     )
 
     server_com = ServerCommunicator(

client/test_client_daemon.py

@@ -915,7 +915,9 @@ def setUp(self):
         self.unsinked_timestamp = 123125
         self.old_timestamp = 123122
 
-        self.snapshot_manager = DirSnapshotManager(self.conf_snap_path)
+        self.snapshot_manager = DirSnapshotManager(
+            self.conf_snap_path,
+            self.test_share_dir)
 
     def tearDown(self):
         self.environment.remove()