fix(72): Fix style and lint issues.

Author: js-dieu

examples/pkg1/test_mod1.py

@@ -7,13 +7,11 @@ def test_sleep1():
     time.sleep(1)
 
 
-@pytest.mark.monitor_skip_test
+@pytest.mark.monitor_skip_test()
 def test_sleep2():
     time.sleep(2)
 
 
-@pytest.mark.parametrize(
-    ("range_max", "other"), [(10, "10"), (100, "100"), (1000, "1000"), (10000, "10000")]
-)
+@pytest.mark.parametrize(("range_max", "other"), [(10, "10"), (100, "100"), (1000, "1000"), (10000, "10000")])
 def test_heavy(range_max, other):
     assert len(["a" * i for i in range(range_max)]) == range_max

examples/pkg4/test_mod_a.py

@@ -15,7 +15,7 @@ def test_not_monitored():
         b_continue = t_delta < 5
 
 
-@pytest.mark.monitor_test
+@pytest.mark.monitor_test()
 def test_force_monitor():
     t_a = time.time()
     b_continue = True

pytest_monitor/handler.py

@@ -77,7 +77,7 @@ def insert_execution_context(self, exc_context):
                     exc_context.architecture,
                     exc_context.system_info,
                     exc_context.python_info,
-                    exc_context.hash(),
+                    exc_context.compute_hash(),
                 ),
             )
 

pytest_monitor/pytest_monitor.py

@@ -224,6 +224,7 @@ def prof():
 def pytest_make_parametrize_id(config, val, argname):
     if config.option.mtr_want_explicit_ids:
         return f"{argname}={val}"
+    return None
 
 
 @pytest.hookimpl(hookwrapper=True)
@@ -258,7 +259,7 @@ def pytest_sessionstart(session):
 
 
 @pytest.fixture(autouse=True, scope="module")
-def prf_module_tracer(request):
+def _prf_module_tracer(request):
     if not PYTEST_MONITORING_ENABLED:
         yield
     else:
@@ -287,7 +288,7 @@ def prf_module_tracer(request):
 
 
 @pytest.fixture(autouse=True)
-def prf_tracer(request):
+def _prf_tracer(request):
     if not PYTEST_MONITORING_ENABLED:
         yield
     else:

pytest_monitor/session.py

@@ -50,10 +50,10 @@ def process(self):
     def get_env_id(self, env):
         db, remote = None, None
         if self.__db:
-            row = self.__db.query("SELECT ENV_H FROM EXECUTION_CONTEXTS WHERE ENV_H= ?", (env.hash(),))
+            row = self.__db.query("SELECT ENV_H FROM EXECUTION_CONTEXTS WHERE ENV_H= ?", (env.compute_hash(),))
             db = row[0] if row else None
         if self.__remote:
-            r = requests.get(f"{self.__remote}/contexts/{env.hash()}")
+            r = requests.get(f"{self.__remote}/contexts/{env.compute_hash()}")
             remote = None
             if r.status_code == HTTPStatus.OK:
                 remote = json.loads(r.text)
@@ -92,12 +92,12 @@ def compute_info(self, description, tags):
         if self.__remote:
             r = requests.post(
                 f"{self.__remote}/sessions/",
-                json=dict(
-                    session_h=self.__session,
-                    run_date=run_date,
-                    scm_ref=scm,
-                    description=json.loads(description),
-                ),
+                json={
+                    "session_h": self.__session,
+                    "run_date": run_date,
+                    "scm_ref": scm,
+                    "description": json.loads(description),
+                },
             )
             if r.status_code != HTTPStatus.CREATED:
                 self.__remote = ""
@@ -109,7 +109,7 @@ def set_environment_info(self, env):
         db_id, remote_id = self.__eid
         if self.__db and db_id is None:
             self.__db.insert_execution_context(env)
-            db_id = self.__db.query("select ENV_H from EXECUTION_CONTEXTS where ENV_H = ?", (env.hash(),))[0]
+            db_id = self.__db.query("select ENV_H from EXECUTION_CONTEXTS where ENV_H = ?", (env.compute_hash(),))[0]
         if self.__remote and remote_id is None:
             # We must postpone that to be run at the end of the pytest session.
             r = requests.post(f"{self.__remote}/contexts/", json=env.to_dict())
@@ -170,22 +170,22 @@ def add_test_info(
         if self.__remote and self.remote_env_id is not None:
             r = requests.post(
                 f"{self.__remote}/metrics/",
-                json=dict(
-                    session_h=self.__session,
-                    context_h=self.remote_env_id,
-                    item_start_time=item_start_time,
-                    item_path=item_path,
-                    item=item,
-                    item_variant=item_variant,
-                    item_fs_loc=item_loc,
-                    kind=kind,
-                    component=final_component,
-                    total_time=total_time,
-                    user_time=user_time,
-                    kernel_time=kernel_time,
-                    cpu_usage=cpu_usage,
-                    mem_usage=mem_usage,
-                ),
+                json={
+                    "session_h": self.__session,
+                    "context_h": self.remote_env_id,
+                    "item_start_time": item_start_time,
+                    "item_path": item_path,
+                    "item": item,
+                    "item_variant": item_variant,
+                    "item_fs_loc": item_loc,
+                    "kind": kind,
+                    "component": final_component,
+                    "total_time": total_time,
+                    "user_time": user_time,
+                    "kernel_time": kernel_time,
+                    "cpu_usage": cpu_usage,
+                    "mem_usage": mem_usage,
+                },
             )
             if r.status_code != HTTPStatus.CREATED:
                 self.__remote = ""

pytest_monitor/sys_utils.py

@@ -11,45 +11,43 @@
 
 
 def collect_ci_info():
-    d = dict()
     # Test for jenkins
-    if "BUILD_NUMBER" in os.environ:
-        if "BRANCH_NAME" in os.environ or "JOB_NAME" in os.environ:
-            br = os.environ["BRANCH_NAME"] if "BRANCH_NAME" in os.environ else os.environ["JOB_NAME"]
-            d = dict(
-                pipeline_branch=br,
-                pipeline_build_no=os.environ["BUILD_NUMBER"],
-                __ci__="jenkinsci",
-            )
+    if "BUILD_NUMBER" in os.environ and ("BRANCH_NAME" in os.environ or "JOB_NAME" in os.environ):
+        br = os.environ["BRANCH_NAME"] if "BRANCH_NAME" in os.environ else os.environ["JOB_NAME"]
+        return {
+            "pipeline_branch": br,
+            "pipeline_build_no": os.environ["BUILD_NUMBER"],
+            "__ci__": "jenkinsci",
+        }
     # Test for CircleCI
     if "CIRCLE_JOB" in os.environ and "CIRCLE_BUILD_NUM" in os.environ:
-        d = dict(
-            pipeline_branch=os.environ["CIRCLE_JOB"],
-            pipeline_build_no=os.environ["CIRCLE_BUILD_NUM"],
-            __ci__="circleci",
-        )
+        return {
+            "pipeline_branch": os.environ["CIRCLE_JOB"],
+            "pipeline_build_no": os.environ["CIRCLE_BUILD_NUM"],
+            "__ci__": "circleci",
+        }
     # Test for TravisCI
     if "TRAVIS_BUILD_NUMBER" in os.environ and "TRAVIS_BUILD_ID" in os.environ:
-        d = dict(
-            pipeline_branch=os.environ["TRAVIS_BUILD_ID"],
-            pipeline_build_no=os.environ["TRAVIS_BUILD_NUMBER"],
-            __ci__="travisci",
-        )
+        return {
+            "pipeline_branch": os.environ["TRAVIS_BUILD_ID"],
+            "pipeline_build_no": os.environ["TRAVIS_BUILD_NUMBER"],
+            "__ci__": "travisci",
+        }
     # Test for DroneCI
     if "DRONE_REPO_BRANCH" in os.environ and "DRONE_BUILD_NUMBER" in os.environ:
-        d = dict(
-            pipeline_branch=os.environ["DRONE_REPO_BRANCH"],
-            pipeline_build_no=os.environ["DRONE_BUILD_NUMBER"],
-            __ci__="droneci",
-        )
+        return {
+            "pipeline_branch": os.environ["DRONE_REPO_BRANCH"],
+            "pipeline_build_no": os.environ["DRONE_BUILD_NUMBER"],
+            "__ci__": "droneci",
+        }
     # Test for Gitlab CI
     if "CI_JOB_NAME" in os.environ and "CI_PIPELINE_ID" in os.environ:
-        d = dict(
-            pipeline_branch=os.environ["CI_JOB_NAME"],
-            pipeline_build_no=os.environ["CI_PIPELINE_ID"],
-            __ci__="gitlabci",
-        )
-    return d
+        return {
+            "pipeline_branch": os.environ["CI_JOB_NAME"],
+            "pipeline_build_no": os.environ["CI_PIPELINE_ID"],
+            "__ci__": "gitlabci",
+        }
+    return {}
 
 
 def determine_scm_revision():
@@ -68,9 +66,9 @@ def _get_cpu_string():
     if platform.system().lower() == "darwin":
         old_path = os.environ["PATH"]
         os.environ["PATH"] = old_path + ":" + "/usr/sbin"
-        ret = subprocess.check_output("sysctl -n machdep.cpu.brand_string", shell=True).decode().strip()
+        ret = subprocess.check_output("sysctl -n machdep.cpu.brand_string", shell=True)
         os.environ["PATH"] = old_path
-        return ret
+        return ret.decode().strip()
     if platform.system().lower() == "linux":
         with open("/proc/cpuinfo", "r", encoding="utf-8") as f:
             lines = [i for i in f if i.startswith("model name")]
@@ -107,19 +105,19 @@ def _read_cpu_freq_from_env(self):
             self.__cpu_freq_base = 0.0
 
     def to_dict(self):
-        return dict(
-            cpu_count=self.cpu_count,
-            cpu_frequency=self.cpu_frequency,
-            cpu_type=self.cpu_type,
-            cpu_vendor=self.cpu_vendor,
-            ram_total=self.ram_total,
-            machine_node=self.fqdn,
-            machine_type=self.machine,
-            machine_arch=self.architecture,
-            system_info=self.system_info,
-            python_info=self.python_info,
-            h=self.hash(),
-        )
+        return {
+            "cpu_count": self.cpu_count,
+            "cpu_frequency": self.cpu_frequency,
+            "cpu_type": self.cpu_type,
+            "cpu_vendor": self.cpu_vendor,
+            "ram_total": self.ram_total,
+            "machine_node": self.fqdn,
+            "machine_type": self.machine,
+            "machine_arch": self.architecture,
+            "system_info": self.system_info,
+            "python_info": self.python_info,
+            "h": self.compute_hash(),
+        }
 
     @property
     def cpu_count(self):
@@ -161,7 +159,7 @@ def system_info(self):
     def python_info(self):
         return self.__py_ver
 
-    def hash(self):
+    def compute_hash(self):
         hr = hashlib.md5()
         hr.update(str(self.__cpu_count).encode())
         hr.update(str(self.__cpu_freq_base).encode())

tests/test_monitor.py

@@ -37,11 +37,9 @@ def test_ok():
     db = sqlite3.connect(str(pymon_path))
     cursor = db.cursor()
     cursor.execute("SELECT ITEM FROM TEST_METRICS;")
-    assert 1 == len(cursor.fetchall())  # current test
+    assert len(cursor.fetchall()) == 1
     cursor = db.cursor()
-    tags = json.loads(
-        cursor.execute("SELECT RUN_DESCRIPTION FROM TEST_SESSIONS;").fetchone()[0]
-    )
+    tags = json.loads(cursor.execute("SELECT RUN_DESCRIPTION FROM TEST_SESSIONS;").fetchone()[0])
     assert "description" not in tags
     assert "version" in tags
     assert tags["version"] == "12.3.5"
@@ -64,9 +62,7 @@ def test_ok():
     )
 
     # run pytest with the following cmd args
-    result = testdir.runpytest(
-        "-vv", "--description", '"Test"', "--tag", "version=12.3.5"
-    )
+    result = testdir.runpytest("-vv", "--description", '"Test"', "--tag", "version=12.3.5")
 
     # fnmatch_lines does an assertion internally
     result.stdout.fnmatch_lines(["*::test_ok PASSED*"])
@@ -80,11 +76,9 @@ def test_ok():
     db = sqlite3.connect(str(pymon_path))
     cursor = db.cursor()
     cursor.execute("SELECT ITEM FROM TEST_METRICS;")
-    assert 1 == len(cursor.fetchall())  # current test
+    assert len(cursor.fetchall()) == 1
     cursor = db.cursor()
-    tags = json.loads(
-        cursor.execute("SELECT RUN_DESCRIPTION FROM TEST_SESSIONS;").fetchone()[0]
-    )
+    tags = json.loads(cursor.execute("SELECT RUN_DESCRIPTION FROM TEST_SESSIONS;").fetchone()[0])
     assert "description" in tags
     assert tags["description"] == '"Test"'
     assert "version" in tags
@@ -182,9 +176,7 @@ def test_ok():
     result = testdir.runpytest("-v")
 
     # fnmatch_lines does an assertion internally
-    result.stdout.fnmatch_lines(
-        ["*::test_ok PASSED*", "*Nothing known about marker monitor_bad_marker*"]
-    )
+    result.stdout.fnmatch_lines(["*::test_ok PASSED*", "*Nothing known about marker monitor_bad_marker*"])
 
     pymon_path = pathlib.Path(str(testdir)) / ".pymon"
     assert pymon_path.exists()
@@ -195,7 +187,7 @@ def test_ok():
     db = sqlite3.connect(str(pymon_path))
     cursor = db.cursor()
     cursor.execute("SELECT ITEM FROM TEST_METRICS;")
-    assert 1 == len(cursor.fetchall())  # current test
+    assert len(cursor.fetchall()) == 1
 
 
 def test_monitor_skip_module(testdir):
@@ -306,9 +298,7 @@ def test_monitored():
     result = testdir.runpytest("-v")
 
     # fnmatch_lines does an assertion internally
-    result.stdout.fnmatch_lines(
-        ["*::test_not_monitored PASSED*", "*::test_monitored PASSED*"]
-    )
+    result.stdout.fnmatch_lines(["*::test_not_monitored PASSED*", "*::test_monitored PASSED*"])
 
     pymon_path = pathlib.Path(str(testdir)) / ".pymon"
     assert pymon_path.exists()
@@ -319,7 +309,7 @@ def test_monitored():
     db = sqlite3.connect(str(pymon_path))
     cursor = db.cursor()
     cursor.execute("SELECT ITEM FROM TEST_METRICS;")
-    assert 1 == len(cursor.fetchall())
+    assert len(cursor.fetchall()) == 1
 
 
 def test_monitor_no_db(testdir):