Replace format() by f-strings

Author: mrbean-bremen

perf_tests/test_dependencies.py

@@ -10,24 +10,24 @@
 @pytest.fixture
 def fixture_path_relative(testdir):
     for i_mod in range(10):
-        test_name = testdir.tmpdir.join("test_dep_perf{}.py".format(i_mod))
+        test_name = testdir.tmpdir.join(f"test_dep_perf{i_mod}.py")
         test_contents = "import pytest\n"
         for i in range(40):
             test_contents += dedent(
-                """
-                @pytest.mark.dependency(depends=["test_{}"])
-                def test_{}():
+                f"""
+                @pytest.mark.dependency(depends=["test_{i + 50}"])
+                def test_{i}():
                     assert True
                 """
-            ).format(i + 50, i)
+            )
         for i in range(60):
             test_contents += dedent(
-                """
+                f"""
                 @pytest.mark.dependency
-                def test_{}():
+                def test_{i + 40}():
                     assert True
                 """
-            ).format(i + 40)
+            )
         test_name.write(test_contents)
     yield testdir
 

perf_tests/test_ordinal.py

@@ -10,16 +10,16 @@
 @pytest.fixture
 def fixture_path_ordinal(testdir):
     for i_mod in range(10):
-        test_name = testdir.tmpdir.join("test_performance{}.py".format(i_mod))
+        test_name = testdir.tmpdir.join(f"test_performance{i_mod}.py")
         test_contents = "import pytest\n"
         for i in range(100):
             test_contents += dedent(
-                """
-                @pytest.mark.order({})
-                def test_{}():
+                f"""
+                @pytest.mark.order({50 - i})
+                def test_{i}():
                     assert True
                 """
-            ).format(50 - i, i)
+            )
         test_name.write(test_contents)
     yield testdir
 

perf_tests/test_relative.py

@@ -10,23 +10,23 @@
 @pytest.fixture
 def fixture_path_relative(testdir):
     for i_mod in range(10):
-        test_name = testdir.tmpdir.join("test_relative_perf{}.py".format(i_mod))
+        test_name = testdir.tmpdir.join(f"test_relative_perf{i_mod}.py")
         test_contents = "import pytest\n"
         for i in range(40):
             test_contents += dedent(
-                """
-                @pytest.mark.order(after="test_{}")
-                def test_{}():
+                f"""
+                @pytest.mark.order(after="test_{i + 50}")
+                def test_{i}():
                     assert True
                 """
-            ).format(i + 50, i)
+            )
         for i in range(60):
             test_contents += dedent(
-                """
-                def test_{}():
+                f"""
+                def test_{i + 40}():
                     assert True
                 """
-            ).format(i + 40)
+            )
         test_name.write(test_contents)
     yield testdir
 

perf_tests/test_relative_dense.py

@@ -10,23 +10,23 @@
 @pytest.fixture
 def fixture_path_relative_dense(testdir):
     for i_mod in range(10):
-        test_name = testdir.tmpdir.join("test_relative_dense_perf{}.py".format(i_mod))
+        test_name = testdir.tmpdir.join(f"test_relative_dense_perf{i_mod}.py")
         test_contents = "import pytest\n"
         for i in range(90):
             test_contents += dedent(
-                """
-                @pytest.mark.order(after="test_{}")
-                def test_{}():
+                f"""
+                @pytest.mark.order(after="test_{i + 10}")
+                def test_{i}():
                     assert True
                 """
-            ).format(i + 10, i)
+            )
         for i in range(10):
             test_contents += dedent(
-                """
-                def test_{}():
+                f"""
+                def test_{i + 90}():
                     assert True
                 """
-            ).format(i + 90)
+            )
         test_name.write(test_contents)
     yield testdir
 

perf_tests/util.py

@@ -12,5 +12,5 @@ def sort_items(self):
         start_time = time.time()
         items = super().sort_items()
         self.__class__.elapsed = (time.time() - start_time) / self.nr_marks * 1000
-        print("\nTime per test: {:.3f} ms".format(self.__class__.elapsed))
+        print(f"\nTime per test: {self.__class__.elapsed:.3f} ms")
         return items

pytest_order/settings.py

@@ -32,15 +32,14 @@ def __init__(self, config: Config) -> None:
         else:
             if scope is not None:
                 warn(
-                    "Unknown order scope '{}', ignoring it. "
-                    "Valid scopes are 'session', 'module' and 'class'.".format(scope)
+                    f"Unknown order scope '{scope}', ignoring it. "
+                    "Valid scopes are 'session', 'module' and 'class'."
                 )
             self.scope = Scope.SESSION
         scope_level: int = config.getoption("order_scope_level") or 0
         if scope_level != 0 and self.scope != Scope.SESSION:
             warn(
-                "order-scope-level cannot be used together with "
-                "--order-scope={}".format(scope)
+                f"order-scope-level cannot be used together with --order-scope={scope}"
             )
             scope_level = 0
         self.scope_level: int = scope_level
@@ -50,10 +49,8 @@ def __init__(self, config: Config) -> None:
         else:
             if group_scope is not None:
                 warn(
-                    "Unknown order group scope '{}', ignoring it. "
-                    "Valid scopes are 'session', 'module' and 'class'.".format(
-                        group_scope
-                    )
+                    f"Unknown order group scope '{group_scope}', ignoring it. "
+                    "Valid scopes are 'session', 'module' and 'class'."
                 )
             self.group_scope = self.scope
         if self.group_scope.value > self.scope.value:

pytest_order/sorter.py

@@ -162,7 +162,7 @@ def handle_order_mark(self, item: Item, mark: Mark) -> None:
             elif order in orders_map:
                 order = orders_map[order]
             else:
-                warn("Unknown order attribute:'{}'".format(order))
+                warn(f"Unknown order attribute:'{order}'")
                 order = None
         if item.order is None:
             item.order = order
@@ -269,11 +269,15 @@ def handle_relative_marks(self, item: Item, mark: Mark) -> bool:
                 self.warn_about_unknown_test(item, after_mark)
         return has_relative_marks
 
-    @staticmethod
-    def warn_about_unknown_test(item: Item, rel_mark: str) -> None:
+    def warn_about_unknown_test(self, item: Item, rel_mark: str) -> None:
+        if self.settings.error_on_failed_ordering:
+            item.item.fixturenames.insert(0, "fail_after_cannot_order")
+            ignore_msg = ""
+        else:
+            ignore_msg = " - ignoring the marker"
         sys.stdout.write(
-            "\nWARNING: cannot execute '{}' relative to others: "
-            "'{}' - ignoring the marker.".format(item.item.name, rel_mark)
+            f"\nWARNING: cannot execute '{item.item.name}' relative to others: "
+            f"'{rel_mark}'{ignore_msg}."
         )
 
     def collect_markers(self) -> None:
@@ -303,8 +307,8 @@ def resolve_dependency_markers(
                         )
                 else:
                     sys.stdout.write(
-                        "\nWARNING: Cannot resolve the dependency marker '{}' "
-                        "- ignoring it.".format(name)
+                        f"\nWARNING: Cannot resolve the dependency marker '{name}' "
+                        "- ignoring it."
                     )
 
     @staticmethod

tests/test_order_scope_level.py

@@ -28,7 +28,7 @@ def test_one(): pass
         """
     )
     for i in range(3):
-        sub_path = "feature{}".format(i)
+        sub_path = f"feature{i}"
         test_path.mkpydir(sub_path)
         path = test_path.tmpdir.join(sub_path, "test_a.py")
         path.write(test_a_contents)