Update error-handling for Mobile Mode

This commit is contained in:
Michael Mintz 2024-08-03 00:53:45 -04:00
parent e8c2147036
commit 9a518568d4
2 changed files with 11 additions and 11 deletions

View File

@ -394,8 +394,8 @@ def uc_special_open_if_cf(
) )
uc_metrics = {} uc_metrics = {}
if ( if (
isinstance(device_width, (int, float)) isinstance(device_width, int)
and isinstance(device_height, (int, float)) and isinstance(device_height, int)
and isinstance(device_pixel_ratio, (int, float)) and isinstance(device_pixel_ratio, (int, float))
): ):
uc_metrics["width"] = device_width uc_metrics["width"] = device_width
@ -1519,8 +1519,8 @@ def _set_chrome_options(
emulator_settings = {} emulator_settings = {}
device_metrics = {} device_metrics = {}
if ( if (
isinstance(device_width, (int, float)) isinstance(device_width, int)
and isinstance(device_height, (int, float)) and isinstance(device_height, int)
and isinstance(device_pixel_ratio, (int, float)) and isinstance(device_pixel_ratio, (int, float))
): ):
device_metrics["width"] = device_width device_metrics["width"] = device_width
@ -3269,8 +3269,8 @@ def get_local_driver(
emulator_settings = {} emulator_settings = {}
device_metrics = {} device_metrics = {}
if ( if (
isinstance(device_width, (int, float)) isinstance(device_width, int)
and isinstance(device_height, (int, float)) and isinstance(device_height, int)
and isinstance(device_pixel_ratio, (int, float)) and isinstance(device_pixel_ratio, (int, float))
): ):
device_metrics["width"] = device_width device_metrics["width"] = device_width
@ -4496,8 +4496,8 @@ def get_local_driver(
if mobile_emulator: if mobile_emulator:
uc_metrics = {} uc_metrics = {}
if ( if (
isinstance(device_width, (int, float)) isinstance(device_width, int)
and isinstance(device_height, (int, float)) and isinstance(device_height, int)
and isinstance(device_pixel_ratio, (int, float)) and isinstance(device_pixel_ratio, (int, float))
): ):
uc_metrics["width"] = device_width uc_metrics["width"] = device_width

View File

@ -14818,8 +14818,8 @@ class BaseCase(unittest.TestCase):
metrics_list = metrics_string.split(",") metrics_list = metrics_string.split(",")
exception_string = ( exception_string = (
"Invalid input for Mobile Emulator device metrics!\n" "Invalid input for Mobile Emulator device metrics!\n"
"Expecting a comma-separated string with three\n" "Expecting a comma-separated string with integer values\n"
"integer values for Width, Height, and Pixel-Ratio.\n" "for Width/Height, and an int or float for Pixel-Ratio.\n"
'Example: --metrics="411,731,3" ' 'Example: --metrics="411,731,3" '
) )
if len(metrics_list) != 3: if len(metrics_list) != 3:
@ -14827,7 +14827,7 @@ class BaseCase(unittest.TestCase):
try: try:
self.__device_width = int(metrics_list[0]) self.__device_width = int(metrics_list[0])
self.__device_height = int(metrics_list[1]) self.__device_height = int(metrics_list[1])
self.__device_pixel_ratio = int(metrics_list[2]) self.__device_pixel_ratio = float(metrics_list[2])
self.mobile_emulator = True self.mobile_emulator = True
except Exception: except Exception:
raise Exception(exception_string) raise Exception(exception_string)