Fix ruff linter errors

Signed-off-by: Taylor Foxhall <[email protected]>

Author: hallfox

.github/workflows/pylint.yaml

@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip3 install -r ${{ github.workspace }}/src/python/requirements.txt
-          pip3 install pylint lint-diffs
+          pip3 install pylint lint-diffs ruff
           ln -s ${{ github.workspace }}/src/python/pylintrc ${{ github.workspace }}/.pylintrc
           echo [pylint] > ${{ github.workspace }}/.lint-diffs
           echo extensions=.py >> ${{ github.workspace }}/.lint-diffs
@@ -39,3 +39,5 @@ jobs:
         run: |
           export PYTHONPATH=${{ github.workspace }}/src/python:$PYTHONPATH
           git diff -U0 origin/main | lint-diffs
+      - name: Check the repo with ruff
+        run: ruff check --output-format=github .

ruff.toml

@@ -0,0 +1 @@
+target-version = "py38"

src/integration-tests/CMakeLists.txt

@@ -84,7 +84,7 @@ if(Pytest_FOUND)
     ENVIRONMENT
       "BLAZINGMQ_BUILD_DIR=${CMAKE_BINARY_DIR}"
     PYTHON_PATH_PREPEND
-      "${CMAKE_SOURCE_DIR}/src/python/"
+      "${CMAKE_CURRENT_SOURCE_DIR}/../python/"
     STRIP_PARAM_BRACKETS
     TRIM_FROM_NAME
       "^test_"

src/integration-tests/conftest.py

@@ -13,31 +13,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# ruff: noqa: E402
+
 import contextlib
 import logging
 
 import pytest
 
-import blazingmq.dev.it.logging
-
 # This must be done early, before we import any module that could call
 # logging.getLogger.
-logging.setLoggerClass(blazingmq.dev.it.logging.BMQLogger)
+import blazingmq.dev.it.logging
 
+logging.setLoggerClass(blazingmq.dev.it.logging.BMQLogger)
 
 import blazingmq.dev.it.testconstants as tc
 import blazingmq.util.logging as bul
 from blazingmq.dev.pytest import PYTEST_LOG_SPEC_VAR
 from blazingmq.dev.it.testhooks import PHASE_REPORT_KEY
-
-# pylint: disable=unused-import, wrong-import-position
 from blazingmq.dev.it.fixtures import (
-    single_node,
-    multi_node,
-    cluster,
-    fsm_single_node,
-    fsm_multi_node,
-    fsm_cluster,
+    multi_node as multi_node,
+    cluster as cluster,
+    order as order,
+    multi7_node as multi7_node,
+    single_node as single_node,
+    cartesian_product_cluster as cartesian_product_cluster,
 )
 
 

src/integration-tests/test_admin_client.py

@@ -26,9 +26,6 @@
 from blazingmq.dev.it.fixtures import (  # pylint: disable=unused-import
     Cluster,
     order,
-    single_node,
-    multi_node,
-    tweak,
 )
 from blazingmq.dev.it.data import data_metrics as dt
 from blazingmq.dev.it.process.admin import AdminClient
@@ -250,7 +247,7 @@ def test_queue_stats(single_node: Cluster, domain_urls: tc.DomainUrls) -> None:
     res = admin.send_admin(
         f"DOMAINS DOMAIN {task.domain} QUEUE {task.queue_name} PURGE baz"
     )
-    assert f"Purged 21 message(s)" in res
+    assert "Purged 21 message(s)" in res
 
     stats = extract_stats(admin.send_admin("encoding json_pretty stat show"))
     queue_stats = stats["domainQueues"]["domains"][domain_fanout][task.uri]
@@ -559,7 +556,7 @@ def test_purge_breathing(single_node: Cluster, domain_urls: tc.DomainUrls) -> No
         res = admin.send_admin(
             f"DOMAINS DOMAIN {task.domain} QUEUE {task.queue_name} PURGE *"
         )
-        assert f"Purged 0 message(s)" in res
+        assert "Purged 0 message(s)" in res
 
     # Stage 2: purge PRIORITY domain
     for i in range(1, 6):
@@ -573,7 +570,7 @@ def test_purge_breathing(single_node: Cluster, domain_urls: tc.DomainUrls) -> No
         assert f"Purged {q1_task.num + q2_task.num} message(s)" in res
 
         res = admin.send_admin(f"DOMAINS DOMAIN {du.domain_priority} PURGE")
-        assert f"Purged 0 message(s)" in res
+        assert "Purged 0 message(s)" in res
 
     # Stage 3: purge FANOUT queues and domain
     for i in range(1, 6):
@@ -597,10 +594,10 @@ def test_purge_breathing(single_node: Cluster, domain_urls: tc.DomainUrls) -> No
             res = admin.send_admin(
                 f"DOMAINS DOMAIN {task.domain} QUEUE {task.queue_name} PURGE {app_id}"
             )
-            assert f"Purged 0 message(s)" in res
+            assert "Purged 0 message(s)" in res
 
         res = admin.send_admin(f"DOMAINS DOMAIN {task.domain} PURGE")
-        assert f"Purged 0 message(s)" in res
+        assert "Purged 0 message(s)" in res
 
     # Stop the admin session
     admin.stop()
@@ -727,11 +724,11 @@ def test_purge_inactive(single_node: Cluster, domain_urls: tc.DomainUrls) -> Non
         res = admin.send_admin(
             f"DOMAINS DOMAIN {record.domain} QUEUE {record.queue_name} PURGE *"
         )
-        assert f"Purged 0 message(s)" in res
+        assert "Purged 0 message(s)" in res
 
     # Also check that purge domain for PRIORITY could not purge more messages.
     res = admin.send_admin(f"DOMAINS DOMAIN {du.domain_priority} PURGE")
-    assert f"Purged 0 message(s)" in res
+    assert "Purged 0 message(s)" in res
 
     # Stage 3: FANOUT purge
 
@@ -754,11 +751,11 @@ def test_purge_inactive(single_node: Cluster, domain_urls: tc.DomainUrls) -> Non
         res = admin.send_admin(
             f"DOMAINS DOMAIN {record.domain} QUEUE {record.queue_name} PURGE *"
         )
-        assert f"Purged 0 message(s)" in res
+        assert "Purged 0 message(s)" in res
 
     # Also check that purge domain for FANOUT could not purge more messages.
     res = admin.send_admin(f"DOMAINS DOMAIN {du.domain_fanout} PURGE")
-    assert f"Purged 0 message(s)" in res
+    assert "Purged 0 message(s)" in res
 
     # Stop the admin session
     admin.stop()

src/integration-tests/test_admin_res_log.py

@@ -47,7 +47,7 @@ def test_adminsession_res_log_stat(
 
     # connect and send request to primary
     admin.connect(leader.config.host, int(leader.config.port))
-    res = admin.send_admin(f"STAT SHOW")
+    res = admin.send_admin("STAT SHOW")
 
     assert ":::::::::: :::::::::: DOMAINQUEUES >>" in res
 
@@ -59,7 +59,7 @@ def test_adminsession_res_log_stat(
 
     # connect and send request to member1
     admin.connect(member1.config.host, int(member1.config.port))
-    res = admin.send_admin(f"STAT SHOW")
+    res = admin.send_admin("STAT SHOW")
 
     assert ":::::::::: :::::::::: DOMAINQUEUES >>" in res
 
@@ -131,8 +131,6 @@ def test_adminsession_res_log_reconfigure(
     member1 = replicas[0]
     member2 = replicas[1]
 
-    num_nodes = len(multi_node.nodes())
-
     # connect and send request to primary
     admin.connect(leader.config.host, int(leader.config.port))
     res = admin.send_admin(f"DOMAINS RECONFIGURE {domain_fanout}")

src/integration-tests/test_alarms.py

@@ -22,8 +22,6 @@
 import blazingmq.dev.it.testconstants as tc
 from blazingmq.dev.it.fixtures import (
     Cluster,
-    cluster,
-    order,
     tweak,
 )  # pylint: disable=unused-import
 

src/integration-tests/test_app_subscriptions.py

@@ -17,13 +17,7 @@
 
 from blazingmq.dev.it.fixtures import (  # pylint: disable=unused-import
     Cluster,
-    cluster,
-    Mode,
-    test_logger,
-    order,
-    multi_node,
     tweak,
-    virtual_cluster_config,
 )
 from blazingmq.dev.it.process.client import Client
 
@@ -61,7 +55,7 @@ def _verify_fanout(self, domain, positiveApps, negativeAppIds, num):
 
         for appId in negativeAppIds:
             self.leader.list_messages(domain, tc.TEST_QUEUE, 0, 2, appId)
-            assert self.leader.outputs_substr(f"Printing 0 message(s)", 1)
+            assert self.leader.outputs_substr("Printing 0 message(s)", 1)
 
     def _verify_delivery(self, consumer, num):
         consumer.wait_push_event()

src/integration-tests/test_appids.py

@@ -19,10 +19,8 @@
 import blazingmq.dev.it.testconstants as tc
 from blazingmq.dev.it.fixtures import (  # pylint: disable=unused-import
     Cluster,
-    cluster,
     test_logger,
     order,
-    multi_node,
     tweak,
 )
 from blazingmq.dev.it.process.client import Client
@@ -853,7 +851,7 @@ def _verify_clients(andConfirm=False):
         # Once queue is created
         leader = cluster.last_known_leader
         leader.list_messages(tc.DOMAIN_FANOUT_SC, tc.TEST_QUEUE, 0, 100)
-        assert leader.outputs_substr(f"Printing 5 message(s)", 5)
+        assert leader.outputs_substr("Printing 5 message(s)", 5)
 
         new_consumer_1 = next(proxies).create_client(new_app_1)
         new_consumer_1.open(
@@ -920,7 +918,7 @@ def _verify_clients(andConfirm=False):
     _verify_clients(andConfirm=True)
 
     leader.list_messages(tc.DOMAIN_FANOUT_SC, tc.TEST_QUEUE, 0, 100)
-    assert leader.outputs_substr(f"Printing 0 message(s)", 5)
+    assert leader.outputs_substr("Printing 0 message(s)", 5)
 
 
 def test_proxy_partial_push(
@@ -929,7 +927,6 @@ def test_proxy_partial_push(
 ):
     """Make Proxy receive PUSH after closing one App"""
 
-    leader = cluster.last_known_leader
     proxies = cluster.proxy_cycle()
 
     proxy = next(proxies)
@@ -1002,13 +999,13 @@ def test_gc_old_data_new_app(cluster: Cluster, domain_urls: tc.DomainUrls):
     )
 
     leader.list_messages(du.domain_fanout, tc.TEST_QUEUE, 0, 100)
-    assert leader.outputs_substr(f"Printing 0 message(s)", 5)
+    assert leader.outputs_substr("Printing 0 message(s)", 5)
 
     leader.list_messages(du.domain_fanout, tc.TEST_QUEUE, 0, 100, appid=app_id)
-    assert leader.outputs_substr(f"Printing 0 message(s)", 5)
+    assert leader.outputs_substr("Printing 0 message(s)", 5)
 
     leader.list_messages(du.domain_fanout, tc.TEST_QUEUE, 0, 100, appid=new_app_1)
-    assert leader.outputs_substr(f"Printing 0 message(s)", 5)
+    assert leader.outputs_substr("Printing 0 message(s)", 5)
 
 
 def test_add_remove_add_app(cluster: Cluster, domain_urls: tc.DomainUrls):

src/integration-tests/test_breathing.py

@@ -23,11 +23,7 @@
 import blazingmq.dev.it.testconstants as tc
 from blazingmq.dev.it.fixtures import (  # pylint: disable=unused-import
     Cluster,
-    cartesian_product_cluster,
-    cluster,
     order,
-    multi_node,
-    multi_interface,
     start_cluster,
     tweak,
 )