[E721] mix

Author: dmitry-lipetsk

src/exceptions.py

@@ -192,7 +192,7 @@ def message(self) -> str:
 
         for f, lines in self._files or []:
             assert type(f) is str
-            assert type(lines) in [str, bytes]  # noqa: E721
+            assert type(lines) in [str, bytes]
             msg.append(u'{}\n----\n{}\n'.format(f, lines))
 
         return six.text_type('\n').join(msg)

src/impl/port_manager__generic.py

@@ -48,7 +48,7 @@ def reserve_port(self) -> int:
             t = None
 
             for port in sampled_ports:
-                assert type(port) is int  # noqa: E721
+                assert type(port) is int
                 assert port not in self._reserved_ports
                 assert port in self._available_ports
 

src/node.py

@@ -2244,7 +2244,7 @@ def _table_checksum__use_cn(
 
             row = cursor.fetchone()
             assert row is not None
-            assert type(row) in [list, tuple]  # noqa: E721
+            assert type(row) in [list, tuple]
             assert len(row) == 1
             v = row[0]
             sum += int(v if v is not None else 0)

tests/helpers/pg_node_utils.py

@@ -59,7 +59,7 @@ def __str__(self) -> str:
 
         def __repr__(self) -> str:
             # It must be overrided!
-            assert type(self) == __class__  # noqa: E721
+            assert type(self) is __class__
             r = "{}({}, {})".format(
                 __class__.__name__,
                 repr(self._data_dir),
@@ -100,7 +100,7 @@ def message(self) -> str:
 
             for f, lines in self._files or []:
                 assert type(f) is str
-                assert type(lines) in [str, bytes]  # noqa: E721
+                assert type(lines) in [str, bytes]
                 msg_parts.append(u'{}\n----\n{}\n'.format(f, lines))
 
             return "\n".join(msg_parts)
@@ -157,7 +157,7 @@ def wait_for_running_state(
         timeout: T_WAIT_TIME,
     ):
         assert type(node) is PostgresNode
-        assert type(node_log_reader) == PostgresNodeLogReader  # noqa: E721
+        assert type(node_log_reader) is PostgresNodeLogReader
         assert type(timeout) in [int, float]
         assert node_log_reader._node is node
         assert timeout > 0
@@ -176,7 +176,7 @@ def wait_for_running_state(
             assert type(blocks) is list
 
             for block in blocks:
-                assert type(block) == PostgresNodeLogReader.LogDataBlock  # noqa: E721
+                assert type(block) is PostgresNodeLogReader.LogDataBlock
 
                 if 'Is another postmaster already running on port' in block.data:
                     raise __class__.PortConflictNodeException(node.data_dir, node.port)

tests/test_os_ops_common.py

@@ -61,7 +61,7 @@ def test_create_clone(self, os_ops: OsOperations):
         clone = os_ops.create_clone()
         assert clone is not None
         assert clone is not os_ops
-        assert type(clone) == type(os_ops)  # noqa: E721
+        assert type(clone) is type(os_ops)
 
     def test_exec_command_success(self, os_ops: OsOperations):
         """
@@ -759,11 +759,11 @@ def __init__(self, sign, source, cp_rw, cp_truncate, cp_binary, cp_data, result)
     )
     def write_data001(self, request):
         assert isinstance(request, pytest.FixtureRequest)
-        assert type(request.param) == __class__.tagWriteData001  # noqa: E721
+        assert type(request.param) is __class__.tagWriteData001
         return request.param
 
     def test_write(self, write_data001: tagWriteData001, os_ops: OsOperations):
-        assert type(write_data001) == __class__.tagWriteData001  # noqa: E721
+        assert type(write_data001) is __class__.tagWriteData001
         assert isinstance(os_ops, OsOperations)
 
         mode = "w+b" if write_data001.call_param__binary else "w+"
@@ -847,7 +847,7 @@ def test_is_port_free__false(self, os_ops: OsOperations):
 
         def LOCAL_server(s: socket.socket):
             assert s is not None
-            assert type(s) == socket.socket  # noqa: E721
+            assert type(s) is socket.socket
 
             try:
                 while True:
@@ -873,7 +873,7 @@ def LOCAL_server(s: socket.socket):
 
                 s.listen(10)
 
-                assert type(th) == threading.Thread  # noqa: E721
+                assert type(th) is threading.Thread
                 th.start()
 
                 try:
@@ -964,7 +964,7 @@ def data001(self, request: pytest.FixtureRequest) -> tagData_OS_OPS__NUMS:
         return request.param
 
     def test_mkdir__mt(self, data001: tagData_OS_OPS__NUMS):
-        assert type(data001) == __class__.tagData_OS_OPS__NUMS   # noqa: E721
+        assert type(data001) is __class__.tagData_OS_OPS__NUMS
 
         N_WORKERS = 4
         N_NUMBERS = data001.nums
@@ -1261,7 +1261,7 @@ def test_kill(
         )
 
         assert proc is not None
-        assert type(proc) == subprocess.Popen  # noqa: E721
+        assert type(proc) is subprocess.Popen
         proc_pid = proc.pid
         assert type(proc_pid) is int
         logging.info("Test process pid is {}".format(proc_pid))
@@ -1332,7 +1332,7 @@ def test_kill__unk_pid(
         )
 
         assert proc is not None
-        assert type(proc) == subprocess.Popen  # noqa: E721
+        assert type(proc) is subprocess.Popen
         proc_pid = proc.pid
         assert type(proc_pid) is int
         logging.info("Test process pid is {}".format(proc_pid))
@@ -1387,10 +1387,10 @@ def test_kill__unk_pid(
         logging.info("Our exception has type [{}]".format(type(x.value).__name__))
 
         if type(os_ops).__name__ == "LocalOsOperations":
-            assert type(x.value) == ProcessLookupError  # noqa: E721
+            assert type(x.value) is ProcessLookupError
             assert "No such process" in str(x.value)
         elif type(os_ops).__name__ == "RemoteOsOperations":
-            assert type(x.value) == ExecUtilException  # noqa: E721
+            assert type(x.value) is ExecUtilException
             assert "No such process" in str(x.value)
         else:
             RuntimeError("Unknown os_ops type: {}".format(type(os_ops).__name__))

tests/test_os_ops_remote.py

@@ -32,8 +32,8 @@ def test_rmdirs__try_to_delete_file(self, os_ops: OsOperations):
             os_ops.rmdirs(path, ignore_errors=False)
 
         assert os.path.exists(path)
-        assert type(x.value) == ExecUtilException   # noqa: E721
-        assert type(x.value.description) == str   # noqa: E721
+        assert type(x.value) is ExecUtilException
+        assert type(x.value.description) is str
         assert x.value.description == "Utility exited with non-zero code (20). Error: `cannot remove '" + path + "': it is not a directory`"
         assert x.value.message.startswith(x.value.description)
         assert type(x.value.error) is str

tests/test_raise_error.py

@@ -16,15 +16,15 @@ def __init__(
             node_status: NodeStatus,
             expected_msg: str,
         ):
-            assert type(node_status) == NodeStatus  # noqa: E721
+            assert type(node_status) is NodeStatus
             assert type(expected_msg) is str
             self.node_status = node_status
             self.expected_msg = expected_msg
             return
 
         @property
         def sign(self) -> str:
-            assert type(self.node_status) == NodeStatus  # noqa: E721
+            assert type(self.node_status) is NodeStatus
 
             msg = "status: {}".format(self.node_status)
             return msg
@@ -53,7 +53,7 @@ def test_001__node_err__cant_enumerate_child_processes(
         self,
         data001: tagTestData001,
     ):
-        assert type(data001) == __class__.tagTestData001  # noqa: E721
+        assert type(data001) is __class__.tagTestData001
 
         with pytest.raises(expected_exception=InvalidOperationException) as x:
             RaiseError.node_err__cant_enumerate_child_processes(
@@ -88,7 +88,7 @@ def test_002__node_err__cant_kill(
         self,
         data002: tagTestData001,
     ):
-        assert type(data002) == __class__.tagTestData001  # noqa: E721
+        assert type(data002) is __class__.tagTestData001
 
         with pytest.raises(expected_exception=InvalidOperationException) as x:
             RaiseError.node_err__cant_kill(

tests/test_testgres_common.py

@@ -1232,7 +1232,7 @@ def test_safe_psql__expect_error(self, node_svc: PostgresNodeService):
         assert isinstance(node_svc, PostgresNodeService)
         with __class__.helper__get_node(node_svc).init().start() as node:
             err = node.safe_psql('select_or_not_select 1', expect_error=True)
-            assert (type(err) == str)  # noqa: E721
+            assert (type(err) is str)
             assert ('select_or_not_select' in err)
             assert ('ERROR:  syntax error at or near "select_or_not_select"' in err)
 

tests/test_testgres_local.py

@@ -273,7 +273,7 @@ def test_port_rereserve_during_node_start(self):
         with get_new_node() as node1:
             node1.init().start()
             assert (node1._should_free_port)
-            assert (type(node1.port) == int)  # noqa: E721
+            assert (type(node1.port) is int)
             node1_port_copy = node1.port
             assert (rm_carriage_returns(node1.safe_psql("SELECT 1;")) == b'1\n')
 
@@ -306,7 +306,7 @@ def test_port_conflict(self):
         with get_new_node() as node1:
             node1.init().start()
             assert (node1._should_free_port)
-            assert (type(node1.port) == int)  # noqa: E721
+            assert (type(node1.port) is int)
             node1_port_copy = node1.port
             assert (rm_carriage_returns(node1.safe_psql("SELECT 1;")) == b'1\n')
 

tests/units/exceptions/BackupException/test_set001__constructor.py

@@ -5,7 +5,7 @@
 class TestSet001_Constructor:
     def test_001__default(self):
         e = BackupException()
-        assert type(e) == BackupException  # noqa: E721
+        assert type(e) is BackupException
         assert isinstance(e, testgres__TestgresException)
         assert e.source is None
         assert e.message == ""
@@ -15,7 +15,7 @@ def test_001__default(self):
 
     def test_002__message(self):
         e = BackupException(message="abc\n123")
-        assert type(e) == BackupException  # noqa: E721
+        assert type(e) is BackupException
         assert isinstance(e, testgres__TestgresException)
         assert e.source is None
         assert e.message == "abc\n123"