!22 适配hdc协议变更

Merge pull request !22 from alex_hold/master

extension/src/xdevice_extension/_core/environment/dmlib.py

@@ -1052,8 +1052,8 @@ class HdcHelper:
 
     @staticmethod
     def handle_shake(connection, connect_key=""):
-        reply = HdcHelper.read(connection, 40)
-        reply_size = struct.unpack(">I12s24s", reply)
+        reply = HdcHelper.read(connection, 48)
+        reply_size = struct.unpack(">I12s32s", reply)
         banner_str = b'OHOS HDC'
         connect_key = connect_key.encode("utf-8")
         size = struct.calcsize('12s256s')

src/xdevice/_core/executor/scheduler.py

@@ -84,6 +84,7 @@ class Scheduler(object):
     task_type = ""
     task_name = ""
     mode = ""
+    proxy = None
 
     # command_queue to store test commands
     command_queue = []
@@ -789,6 +790,10 @@ class Scheduler(object):
         LOG.info(
             "get upload params: %s, %s, %s, %s, %s, %s" % (
                 case_id, result, error, start_time, end_time, report_path))
+        if Scheduler.proxy:
+            Scheduler.proxy.upload_result(case_id, result, error,
+                start_time, end_time, report_path)
+            return
         from agent.factory import upload_result
         upload_result(case_id, result, error, start_time, end_time,
                       report_path)
@@ -814,7 +819,6 @@ class Scheduler(object):
                       error_no="00201")
             return
         LOG.info("need upload %s case" % len(upload_params))
-        from agent.factory import upload_batch
         upload_suite = []
         for upload_param in upload_params:
             case_id, result, error, start_time, end_time, report_path = \
@@ -824,6 +828,11 @@ class Scheduler(object):
                     "report": report_path}
             LOG.info("case info: %s", case)
             upload_suite.append(case)
+        if Scheduler.proxy:
+            Scheduler.proxy.upload_result(case_id, result, error,
+                start_time, end_time, report_path)
+            return
+        from agent.factory import upload_batch            
         upload_batch(upload_suite)
 
     @classmethod