Skip to content

Commit 2e3b540

Browse files
j-ororkej-ororke
committed
Updating manualTests.json and mdns_discovery.py:
- Updated manualTests.json to remove Test_TC_CADMIN_1_15 from the list of CADMIN yaml scripts - Updated mdns_discovery module to include description of "expected_value" arg.
1 parent d0bf508 commit 2e3b540

File tree

2 files changed

+124
-37
lines changed

2 files changed

+124
-37
lines changed

‎src/app/tests/suites/manualTests.json

+123-37
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@
5555
"Test_TC_BDX_2_4",
5656
"Test_TC_BDX_2_5"
5757
],
58-
"bridge": ["Test_TC_BR_1", "Test_TC_BR_2", "Test_TC_BR_3", "Test_TC_BR_4"],
58+
"bridge": [
59+
"Test_TC_BR_1",
60+
"Test_TC_BR_2",
61+
"Test_TC_BR_3",
62+
"Test_TC_BR_4"
63+
],
5964
"DeviceAttestation": [
6065
"Test_TC_DA_1_1",
6166
"Test_TC_DA_1_3",
@@ -108,13 +113,25 @@
108113
"Test_TC_DLOG_2_2",
109114
"Test_TC_DLOG_3_1"
110115
],
111-
"Descriptor": ["Test_TC_DESC_2_1"],
112-
"DeviceEnergyManagementMode": ["Test_TC_DEMM_1_2"],
113-
"EnergyEVSEMode": ["Test_TC_EEVSEM_1_2"],
116+
"Descriptor": [
117+
"Test_TC_DESC_2_1"
118+
],
119+
"DeviceEnergyManagementMode": [
120+
"Test_TC_DEMM_1_2"
121+
],
122+
"EnergyEVSEMode": [
123+
"Test_TC_EEVSEM_1_2"
124+
],
114125
"FanControl": [],
115-
"GeneralCommissioning": ["Test_TC_CGEN_2_2"],
116-
"GeneralDiagnostics": ["Test_TC_DGGEN_2_2"],
117-
"Identify": ["Test_TC_I_3_2"],
126+
"GeneralCommissioning": [
127+
"Test_TC_CGEN_2_2"
128+
],
129+
"GeneralDiagnostics": [
130+
"Test_TC_DGGEN_2_2"
131+
],
132+
"Identify": [
133+
"Test_TC_I_3_2"
134+
],
118135
"IcdManagement": [],
119136
"IlluminanceMeasurement": [],
120137
"InteractionDataModel": [
@@ -170,7 +187,6 @@
170187
"Test_TC_CADMIN_1_8",
171188
"Test_TC_CADMIN_1_12",
172189
"Test_TC_CADMIN_1_14",
173-
"Test_TC_CADMIN_1_15",
174190
"Test_TC_CADMIN_1_16",
175191
"Test_TC_CADMIN_1_17",
176192
"Test_TC_CADMIN_1_18",
@@ -185,7 +201,11 @@
185201
"Test_TC_CADMIN_1_25",
186202
"Test_TC_CADMIN_1_26"
187203
],
188-
"ModeSelect": ["Test_TC_MOD_1_2", "Test_TC_MOD_1_3", "Test_TC_MOD_2_2"],
204+
"ModeSelect": [
205+
"Test_TC_MOD_1_2",
206+
"Test_TC_MOD_1_3",
207+
"Test_TC_MOD_2_2"
208+
],
189209
"OTASoftwareUpdate": [
190210
"Test_TC_SU_1_1",
191211
"Test_TC_SU_2_1",
@@ -203,7 +223,9 @@
203223
"Test_TC_SU_4_1",
204224
"Test_TC_SU_4_2"
205225
],
206-
"PowerSourceConfiguration": ["Test_TC_PSCFG_2_2"],
226+
"PowerSourceConfiguration": [
227+
"Test_TC_PSCFG_2_2"
228+
],
207229
"PressureMeasurement": [],
208230
"SecureChannel": [
209231
"Test_TC_SC_1_1",
@@ -236,48 +258,100 @@
236258
"Test_TC_DGSW_2_3"
237259
],
238260
"EthernetNetworkDiagnostics": [],
239-
"WiFiNetworkDiagnostics": ["Test_TC_DGWIFI_2_2"],
261+
"WiFiNetworkDiagnostics": [
262+
"Test_TC_DGWIFI_2_2"
263+
],
240264
"WindowCovering": [],
241-
"FlowMeasurement": ["Test_TC_FLW_2_2"],
242-
"GroupKeyManagement": ["Test_TC_GRPKEY_5_4"],
243-
"OccupancySensing": ["Test_TC_OCC_3_1"],
244-
"PowerSource": ["Test_TC_PS_2_2"],
245-
"BooleanState": ["Test_TC_BOOL_2_2"],
265+
"FlowMeasurement": [
266+
"Test_TC_FLW_2_2"
267+
],
268+
"GroupKeyManagement": [
269+
"Test_TC_GRPKEY_5_4"
270+
],
271+
"OccupancySensing": [
272+
"Test_TC_OCC_3_1"
273+
],
274+
"PowerSource": [
275+
"Test_TC_PS_2_2"
276+
],
277+
"BooleanState": [
278+
"Test_TC_BOOL_2_2"
279+
],
246280
"ColorControl": [
247281
"Test_TC_CC_3_1",
248282
"Test_TC_CC_7_1",
249283
"Test_TC_CC_9_1",
250284
"Test_TC_CC_9_2",
251285
"Test_TC_CC_9_3"
252286
],
253-
"DoorLock": ["Test_TC_DRLK_2_10", "Test_TC_DRLK_3_2"],
254-
"DeviceEnergyManagement": ["Test_TC_DEM_1_1"],
287+
"DoorLock": [
288+
"Test_TC_DRLK_2_10",
289+
"Test_TC_DRLK_3_2"
290+
],
291+
"DeviceEnergyManagement": [
292+
"Test_TC_DEM_1_1"
293+
],
255294
"LocalizationConfiguration": [],
256295
"LevelControl": [],
257-
"LaundryWasherMode": ["Test_TC_LWM_1_2"],
258-
"OnOff": ["Test_TC_OO_2_3"],
259-
"RelativeHumidityMeasurement": ["Test_TC_RH_2_2"],
296+
"LaundryWasherMode": [
297+
"Test_TC_LWM_1_2"
298+
],
299+
"OnOff": [
300+
"Test_TC_OO_2_3"
301+
],
302+
"RelativeHumidityMeasurement": [
303+
"Test_TC_RH_2_2"
304+
],
260305
"SmokeCOAlarm": [],
261-
"RefrigeratorAlarm": ["Test_TC_REFALM_2_2", "Test_TC_REFALM_2_3"],
262-
"RVCCleanMode": ["Test_TC_RVCCLEANM_3_3"],
263-
"RVCOperationalState": ["Test_TC_RVCOPSTATE_2_2"],
264-
"RVCRunMode": ["Test_TC_RVCRUNM_3_3"],
306+
"RefrigeratorAlarm": [
307+
"Test_TC_REFALM_2_2",
308+
"Test_TC_REFALM_2_3"
309+
],
310+
"RVCCleanMode": [
311+
"Test_TC_RVCCLEANM_3_3"
312+
],
313+
"RVCOperationalState": [
314+
"Test_TC_RVCOPSTATE_2_2"
315+
],
316+
"RVCRunMode": [
317+
"Test_TC_RVCRUNM_3_3"
318+
],
265319
"TemperatureControlledCabinetMode": [
266320
"Test_TC_TCCM_1_2",
267321
"Test_TC_TCCM_2_1"
268322
],
269-
"Switch": ["Test_TC_SWTCH_3_2"],
323+
"Switch": [
324+
"Test_TC_SWTCH_3_2"
325+
],
270326
"TemperatureControl": [],
271-
"TemperatureMeasurement": ["Test_TC_TMP_2_2"],
272-
"Thermostat": ["Test_TC_TSTAT_3_2"],
327+
"TemperatureMeasurement": [
328+
"Test_TC_TMP_2_2"
329+
],
330+
"Thermostat": [
331+
"Test_TC_TSTAT_3_2"
332+
],
273333
"ThermostatUserConfiguration": [],
274-
"ThreadNetworkDiagnostics": ["Test_TC_DGTHREAD_2_5"],
275-
"Actions": ["Test_TC_ACT_2_1", "Test_TC_ACT_2_2", "Test_TC_ACT_3_2"],
334+
"ThreadNetworkDiagnostics": [
335+
"Test_TC_DGTHREAD_2_5"
336+
],
337+
"Actions": [
338+
"Test_TC_ACT_2_1",
339+
"Test_TC_ACT_2_2",
340+
"Test_TC_ACT_3_2"
341+
],
276342
"TimeFormatLocalization": [],
277343
"TimeSynchronization": [],
278344
"UnitLocalization": [],
279-
"Binding": ["Test_TC_BIND_2_1", "Test_TC_BIND_2_2", "Test_TC_BIND_2_3"],
280-
"ScenesManagement": ["Test_TC_S_2_5", "Test_TC_S_2_6", "Test_TC_S_3_1"],
345+
"Binding": [
346+
"Test_TC_BIND_2_1",
347+
"Test_TC_BIND_2_2",
348+
"Test_TC_BIND_2_3"
349+
],
350+
"ScenesManagement": [
351+
"Test_TC_S_2_5",
352+
"Test_TC_S_2_6",
353+
"Test_TC_S_3_1"
354+
],
281355
"PumpConfigurationControl": [],
282356
"AccessControl": [],
283357
"UserLabel": [],
@@ -286,11 +360,23 @@
286360
"Test_TC_BRBINFO_3_1"
287361
],
288362
"LaundryWasherControl": [],
289-
"OvenMode": ["Test_TC_OTCCM_1_2", "Test_TC_OTCCM_3_2", "Test_TC_OTCCM_3_3"],
363+
"OvenMode": [
364+
"Test_TC_OTCCM_1_2",
365+
"Test_TC_OTCCM_3_2",
366+
"Test_TC_OTCCM_3_3"
367+
],
290368
"AccessControlEnforcement": [],
291-
"OvenMode": ["Test_TC_OTCCM_1_1", "Test_TC_OTCCM_1_2"],
292-
"EnergyEVSE": ["Test_TC_EEVSE_1_1", "Test_TC_EEVSE_2_1"],
293-
"PowerTopology": ["Test_TC_PWRTL_1_1"],
369+
"OvenMode": [
370+
"Test_TC_OTCCM_1_1",
371+
"Test_TC_OTCCM_1_2"
372+
],
373+
"EnergyEVSE": [
374+
"Test_TC_EEVSE_1_1",
375+
"Test_TC_EEVSE_2_1"
376+
],
377+
"PowerTopology": [
378+
"Test_TC_PWRTL_1_1"
379+
],
294380
"collection": [
295381
"DeviceDiscovery",
296382
"Groups",
@@ -365,4 +451,4 @@
365451
"AccessControlEnforcement",
366452
"LaundryWasherControl"
367453
]
368-
}
454+
}

‎src/python_testing/mdns_discovery/mdns_discovery.py

+1
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ async def _get_service(self, service_type: MdnsServiceType,
504504
service_type (MdnsServiceType): The enum representing the type of mDNS service to discover.
505505
log_output (bool): Logs the discovered services to the console. Defaults to False.
506506
discovery_timeout_sec (float): Defaults to 15 seconds.
507+
expected_value (str): Defaults to none as currently only utilized to gather specific record in multiple discovery records if available
507508
508509
Returns:
509510
Optional[MdnsServiceInfo]: An instance of MdnsServiceInfo representing the discovered service, if

0 commit comments

Comments
 (0)