review comment

tests/platform_tests/api/test_watchdog.py

@@ -67,9 +67,9 @@ def test_arm_disarm_states(self, duthost, localhost, platform_api_conn, conf):
  actual_timeout = watchdog.arm(platform_api_conn, watchdog_timeout)
 
  if self.expect(actual_timeout is not None, "Watchdog.arm is not supported"):
- pytest_assert(isinstance(actual_timeout, int), "actual_timeout appears incorrect")
- if self.expect(actual_timeout != -1, "Failed to arm the watchdog"):
- self.expect(actual_timeout >= watchdog_timeout, "Actual watchdog timeout {} seconds appears wrong, should be less than {} seconds".format(actual_timeout, watchdog_timeout))
+ if self.expect(isinstance(actual_timeout, int), "actual_timeout appears incorrect")
+  if self.expect(actual_timeout != -1, "Failed to arm the watchdog"):
+  self.expect(actual_timeout >= watchdog_timeout, "Actual watchdog timeout {} seconds appears wrong, should be less than {} seconds".format(actual_timeout, watchdog_timeout))
 
  watchdog_status = watchdog.is_armed(platform_api_conn)
  if self.expect(watchdog_status is not None, "Failed to retrieve watchdog status"):
@@ -78,8 +78,8 @@ def test_arm_disarm_states(self, duthost, localhost, platform_api_conn, conf):
  remaining_time = watchdog.get_remaining_time(platform_api_conn)
 
  if self.expect(remaining_time is not None, "Failed to get the remaining time of watchdog"):
- pytest_assert(isinstance(remaining_time, int), "remaining_time appears incorrect")
- self.expect(remaining_time <= watchdog_timeout, "Watchdog remaining_time {} seconds appears wrong compared to watchdog timeout {} seocnds".format(remaining_time))
+ if self.expect(isinstance(remaining_time, int), "remaining_time appears incorrect")
+  self.expect(remaining_time <= watchdog_timeout, "Watchdog remaining_time {} seconds appears wrong compared to watchdog timeout {} seocnds".format(remaining_time))
 
  watchdog_status = watchdog.disarm(platform_api_conn)
  if self.expect(watchdog_status is not None, "Watchdog.disarm is not supported"):