@@ -779,7 +779,7 @@ private JSONObject runTestTaskByGroup(TestTaskSpec testTaskSpec) {
779
779
if (deviceGroup .getIsPrivate ()) {
780
780
checkAccessInfo (testTaskSpec .deviceIdentifier , testTaskSpec .accessKey );
781
781
}
782
- Map <String , List <String >> agents = new HashMap <>();
782
+ Map <String , List <String >> testAgentDevicesMap = new HashMap <>();
783
783
boolean isSingle = Const .DeviceGroup .SINGLE_TYPE .equals (testTaskSpec .groupTestType );
784
784
boolean isAll = Const .DeviceGroup .ALL_TYPE .equals (testTaskSpec .groupTestType );
785
785
Message message = new Message ();
@@ -796,10 +796,9 @@ private JSONObject runTestTaskByGroup(TestTaskSpec testTaskSpec) {
796
796
}
797
797
isAllOffline = false ;
798
798
if (device .isOnline ()) {
799
- updateDeviceStatus (deviceSerial , DeviceInfo .TESTING , testTaskSpec .testTaskId );
800
- List <String > devices = agents .getOrDefault (device .getAgentId (), new ArrayList <>());
799
+ List <String > devices = testAgentDevicesMap .getOrDefault (device .getAgentId (), new ArrayList <>());
801
800
devices .add (device .getSerialNum ());
802
- agents .put (device .getAgentId (), devices );
801
+ testAgentDevicesMap .put (device .getAgentId (), devices );
803
802
testTaskSpec .agentIds .add (device .getAgentId ());
804
803
if (isSingle ) {
805
804
break ;
@@ -809,9 +808,13 @@ private JSONObject runTestTaskByGroup(TestTaskSpec testTaskSpec) {
809
808
}
810
809
}
811
810
Assert .isTrue (!isAllOffline , "All Device/Agent Offline!" );
812
- for (String agentId : agents .keySet ()) {
811
+ for (String agentId : testAgentDevicesMap .keySet ()) {
813
812
AgentSessionInfo agentSessionInfoByAgentId = getAgentSessionInfoByAgentId (agentId );
814
- String groupDevices = String .join ("," , agents .get (agentId ));
813
+ List <String > testDeviceSerials = testAgentDevicesMap .get (agentId );
814
+ for (String temp : testDeviceSerials ) {
815
+ updateDeviceStatus (temp , DeviceInfo .TESTING , testTaskSpec .testTaskId );
816
+ }
817
+ String groupDevices = String .join ("," , testDeviceSerials );
815
818
Assert .notNull (agentSessionInfoByAgentId , "Device/Agent Offline!" );
816
819
if (result .get (Const .Param .TEST_DEVICE_SN ) == null ) {
817
820
result .put (Const .Param .TEST_DEVICE_SN , groupDevices );
0 commit comments