Skip to content
Merged

Dev #58

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions core/app_scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ def _upload(self, source, dest, check_modified=True):
except Exception:
result_time = None

# NOTE: This fallback change is done only to support MTL-SU-IDCLAB-23,
# NOTE: This fallback change is to support other locales,
# where `forfiles` returns values like "08-03-2026 17:00:47".
if result_time is None and len(time_pieces) >= 2:
mod_time_str = time_pieces[0] + " " + time_pieces[1]
Expand Down Expand Up @@ -1919,10 +1919,12 @@ def _check_remote_file_exists(self, path, in_exec_path=True, target_ip=None):
return True

''' Creates the prep status file if there is no error or failures. If exists, deletes first. '''
def createPrepStatusControlFile(self, suffix=""):
def createPrepStatusControlFile(self, suffix="", module=""):
if isinstance(suffix, list):
suffix = self._getLatestFileTimestampSuffix(suffix)
path = os.path.join(self.dut_exec_path, "prep_status", self._module + suffix)
if module == "":
module = self._module
path = os.path.join(self.dut_exec_path, "prep_status", module + suffix)
if self.platform.lower() == "macos":
path = path.replace("\\", "/")
self._remote_make_dir(path, True)
Expand Down
40 changes: 20 additions & 20 deletions scenarios/common/comm_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,26 @@ def runTest(self):
failed = True

# WinAppDriver
# try:
if self.platform.lower() == "windows":
self._call([(self.dut_exec_path + "\\WindowsApplicationDriver\\WinAppDriver.exe"), (self.dut_resolved_ip + " " + self.app_port)], blocking=False, timeout=5)
time.sleep(1)
desired_caps = {}
desired_caps["app"] = "Root"
desktop = self._launchApp(desired_caps)
logging.info("WinAppDriver launch:\tOK")
# except:
# logging.info("WinAppDriver launch:\tFAIL")
# failed = True

try:
desktop.find_element_by_name("Start")
self._kill("winappdriver.exe")
logging.info("WinAppDriver comm:\tOK")
except:
logging.info("WinAppDriver comm:\tFAIL")
self._page_source(desktop)
failed = True
# Note: currently self.dut_resolved_ip is not defined for comm_check
# if self.platform.lower() == "windows":
# self._call([(self.dut_exec_path + "\\WindowsApplicationDriver\\WinAppDriver.exe"), (self.dut_resolved_ip + " " + self.app_port)], blocking=False, timeout=5)
# time.sleep(1)
# desired_caps = {}
# desired_caps["app"] = "Root"
# desktop = self._launchApp(desired_caps)
# logging.info("WinAppDriver launch:\tOK")
# # except:
# # logging.info("WinAppDriver launch:\tFAIL")
# # failed = True

# try:
# desktop.find_element_by_name("Start")
# self._kill("winappdriver.exe")
# logging.info("WinAppDriver comm:\tOK")
# except:
# logging.info("WinAppDriver comm:\tFAIL")
# self._page_source(desktop)
# failed = True

if failed:
self.fail("At least one communication check failed")
Expand Down