Adjust assert to use truthy expressions

This is a small improvement, detected during code review.

Re ECFLOW-2110

Author: marcosbento

libs/pyext/test/ecflow_test_util.py

@@ -142,7 +142,6 @@ def clean_up_data(port):
         print("   Remove OK")
     except:
         print("   Remove Failed")
-        pass
 
 
 class Protocol(Enum):
@@ -158,7 +157,6 @@ class EcfPortLock(object):
     def __init__(self, protocol):
         print("   EcfPortLock:__init__")
         self._protocol = protocol
-        pass
 
     def at_time(self):
         return datetime.datetime.fromtimestamp(time.time()).strftime("%H:%M:%S")
@@ -173,7 +171,7 @@ def find_free_port(self, seed_port):
         port = seed_port
         while 1:
             # port must be free for at least 15 seconds
-            if self._timed_free_port(port, 3) == True:
+            if self._timed_free_port(port, 3):
                 print(
                     "   *FOUND* free server port " + str(port) + " : " + self.at_time()
                 )
@@ -193,7 +191,7 @@ def find_free_port(self, seed_port):
     def _timed_free_port(self, port, wait_time=10):
         count = 0
         while count < wait_time:
-            if self._free_port(port) == True:
+            if self._free_port(port):
                 count = count + 1
                 time.sleep(1)
             else:
@@ -431,7 +429,6 @@ def __enter__(self):
 
     def __exit__(self, exception_type, exception_value, exception_traceback):
         os.remove(self.name)
-        pass
 
     def __str__(self):
         return f"Test.MockFile({self.name}, {self.content})"

libs/pyext/test/py_s_TestClientApi.py

@@ -240,13 +240,13 @@ def test_set_host_port(self):
         assert _can_set_host_port(ci, "host", 4444), "Expected no errors"
         assert _can_set_combined_host_port(ci, "host:4444"), "Expected no errors"
         assert _can_set_combined_host_port(ci, "host@4444"), "Expected no errors"
-        assert _can_set_host_port(ci, "", "") == False, "Expected errors"
-        assert _can_set_host_port(ci, "host", "") == False, "Expected errors"
-        assert _can_set_host_port(ci, "host", "host") == False, "Expected errors"
-        assert _can_set_combined_host_port(ci, "host:host") == False, "Expected errors"
-        assert _can_set_combined_host_port(ci, "3141:host") == False, "Expected errors"
-        assert _can_set_combined_host_port(ci, "3141@host") == False, "Expected errors"
-        assert _can_set_combined_host_port(ci, "3141@") == False, "Expected errors"
+        assert not _can_set_host_port(ci, "", ""), "Expected errors"
+        assert not _can_set_host_port(ci, "host", ""), "Expected errors"
+        assert not _can_set_host_port(ci, "host", "host"), "Expected errors"
+        assert not _can_set_combined_host_port(ci, "host:host"), "Expected errors"
+        assert not _can_set_combined_host_port(ci, "3141:host"), "Expected errors"
+        assert not _can_set_combined_host_port(ci, "3141@host"), "Expected errors"
+        assert not _can_set_combined_host_port(ci, "3141@"), "Expected errors"
 
         assert _can_construct_client_with_host_port(
             "host", "3141"
@@ -255,18 +255,16 @@ def test_set_host_port(self):
         assert _can_construct_client_with_combined_host_port(
             "host:4444"
         ), "Expected no errors"
-        assert _can_construct_client_with_host_port("", "") == False, "Expected errors"
-        assert (
-            _can_construct_client_with_host_port("host", "") == False
+        assert not _can_construct_client_with_host_port("", ""), "Expected errors"
+        assert not _can_construct_client_with_host_port("host", ""), "Expected errors"
+        assert not _can_construct_client_with_host_port(
+            "host", "host"
         ), "Expected errors"
-        assert (
-            _can_construct_client_with_host_port("host", "host") == False
+        assert not _can_construct_client_with_combined_host_port(
+            "host:host"
         ), "Expected errors"
-        assert (
-            _can_construct_client_with_combined_host_port("host:host") == False
-        ), "Expected errors"
-        assert (
-            _can_construct_client_with_combined_host_port("3141:host") == False
+        assert not _can_construct_client_with_combined_host_port(
+            "3141:host"
         ), "Expected errors"
 
 
@@ -480,8 +478,8 @@ def test_client_checkpt(self):
         assert os.path.exists(
             Test.checkpt_file_path(port)
         ), "Expected check pt file to exist after ci.checkpt()"
-        assert (
-            os.path.exists(Test.backup_checkpt_file_path(port)) == False
+        assert not os.path.exists(
+            Test.backup_checkpt_file_path(port)
         ), "Expected back up check pt file to *NOT* exist"
 
         self.ci.checkpt()  # second check pt should cause backup check pt to be written
@@ -1927,9 +1925,9 @@ def test_client_alter_change(self):
         sync_local(self.ci)
         task_t1 = self.ci.get_defs().find_abs_node(t1)
         event = task_t1.find_event("event")
-        assert (
-            event.value() == True
-        ), "Expected alter of event to be set but found " + str(event.value())
+        assert event.value(), "Expected alter of event to be set but found " + str(
+            event.value()
+        )
         res = self.ci.query("event", task_t1.get_abs_node_path(), "event")
         assert res == "set", "Expected alter of event to be 'set' but found " + res
 
@@ -2129,12 +2127,10 @@ def test_client_force(self):
                 for event in task.events:
                     event_fnd = True
                     if ev_state == "set":
-                        assert event.value() == True, " Expected event value to be set"
+                        assert event.value(), " Expected event value to be set"
                     else:
-                        assert (
-                            event.value() == False
-                        ), " Expected event value to be clear"
-                assert event_fnd == True, " Expected event to be found"
+                        assert not event.value(), " Expected event value to be clear"
+                assert event_fnd, " Expected event to be found"
 
         event_path_list = [
             "/test_client_force/f1/t1:event",
@@ -2150,12 +2146,10 @@ def test_client_force(self):
                 for event in task.events:
                     event_fnd = True
                     if ev_state == "set":
-                        assert event.value() == True, " Expected event value to be set"
+                        assert event.value(), " Expected event value to be set"
                     else:
-                        assert (
-                            event.value() == False
-                        ), " Expected event value to be clear"
-                assert event_fnd == True, " Expected event to be found"
+                        assert not event.value(), " Expected event value to be clear"
+                assert event_fnd, " Expected event to be found"
 
     @pytest.mark.parametrize("on_disk", [False, True], ids=["in_memory", "on_disk"])
     def test_client_replace(self, on_disk):
@@ -2405,7 +2399,7 @@ def test_client_resume(self):
         self.ci.resume("/test_client_resume")
         sync_local(self.ci)
         suite = self.ci.get_defs().find_suite("test_client_resume")
-        assert suite.is_suspended() == False, "Expected to find suite resumed"
+        assert not suite.is_suspended(), "Expected to find suite resumed"
 
     def test_client_resume_multiple_paths(self):
         print_test(self.ci, "test_client_resume_multiple_paths")
@@ -2443,8 +2437,8 @@ def test_client_resume_multiple_paths(self):
         task_t2 = self.ci.get_defs().find_abs_node(
             "/test_client_resume_multiple_paths/f1/t2"
         )
-        assert task_t1.is_suspended() == False, "Expected to find task t1 to be resumed"
-        assert task_t2.is_suspended() == False, "Expected to find task t2 to be resumed"
+        assert not task_t1.is_suspended(), "Expected to find task t1 to be resumed"
+        assert not task_t2.is_suspended(), "Expected to find task t2 to be resumed"
 
     def test_client_delete_node(self):
         print_test(self.ci, "test_client_delete_node")

libs/pyext/test/py_u_TestNodeAdd.py

@@ -116,7 +116,7 @@ def test_node_dunder_lshift(self):
             len(list(suite))
         )
 
-        assert suite.t4.get_trigger() == None, "Trigger not as expected: " + str(
+        assert suite.t4.get_trigger() is None, "Trigger not as expected: " + str(
             suite.t4.get_trigger()
         )
         assert (
@@ -134,7 +134,7 @@ def test_node_dunder_lshift(self):
             len(list(fam))
         )
 
-        assert fam.t4.get_trigger() == None, "Trigger not as expected: " + str(
+        assert fam.t4.get_trigger() is None, "Trigger not as expected: " + str(
             fam.t4.get_trigger()
         )
         assert (
@@ -161,7 +161,7 @@ def test_node_dunder_lshift_trigger_cat(self):
             len(list(suite))
         )
 
-        assert suite.t4.get_trigger() == None, "Trigger not as expected: " + str(
+        assert suite.t4.get_trigger() is None, "Trigger not as expected: " + str(
             suite.t4.get_trigger()
         )
         assert (

libs/pyext/test/py_u_TestRepeatArithmetic.py

@@ -28,7 +28,7 @@ def _test_repeat_arithmetic(repeat_to_add, repeat_to_add2):
 
     # Initial value of repeat is 20090101 hence trigger should fail to evaluate
     assert (
-        t2.evaluate_trigger() is False
+        not t2.evaluate_trigger()
     ), "Expected trigger to evaluate. 20090101 >= 20100601"
 
     # Check end of month - 1
@@ -62,7 +62,7 @@ def _test_repeat_datetime_arithmetic(repeat_to_add, repeat_to_add2):
 
     # Initial value of repeat is 20090101 hence trigger should fail to evaluate
     assert (
-        t2.evaluate_trigger() is False
+        not t2.evaluate_trigger()
     ), "Expected trigger to evaluate. 20090101T000000 >= 20100601T000000"
 
     # Check end of month - 1 day