Run pyupgrade against the files modified in the merge-forward

s0undt3ch · s0undt3ch · commit 045b5ca22f54 · 2023-12-14T11:33:55.000Z
diff --git a/tests/pytests/unit/modules/test_vagrant.py b/tests/pytests/unit/modules/test_vagrant.py
@@ -59,7 +59,7 @@ def test_vagrant_init_positional(local_opts, tmp_path):
             different="very",
         )
         mock_sdb.assert_called_with(
-            "sdb://vagrant_sdb_data/onetest?{}".format(path_nowhere),
+            f"sdb://vagrant_sdb_data/onetest?{path_nowhere}",
             "test1",
             local_opts,
         )
@@ -138,7 +138,7 @@ def test_vagrant_destroy(local_opts, tmp_path):
             with patch.dict(vagrant.__utils__, {"sdb.sdb_get": mock_sdb_get}):
                 assert vagrant.destroy("test4")
                 mock_sdb.assert_any_call(
-                    "sdb://vagrant_sdb_data/macfour?{}".format(path_mydir),
+                    f"sdb://vagrant_sdb_data/macfour?{path_mydir}",
                     local_opts,
                 )
                 mock_sdb.assert_any_call("sdb://vagrant_sdb_data/test4", local_opts)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ def test_vagrant_init_positional(local_opts, tmp_path):`
`59`	`59`	`different="very",`
`60`	`60`	`)`
`61`	`61`	`mock_sdb.assert_called_with(`
`62`		`- "sdb://vagrant_sdb_data/onetest?{}".format(path_nowhere),`
	`62`	`+ f"sdb://vagrant_sdb_data/onetest?{path_nowhere}",`
`63`	`63`	`"test1",`
`64`	`64`	`local_opts,`
`65`	`65`	`)`
`@@ -138,7 +138,7 @@ def test_vagrant_destroy(local_opts, tmp_path):`
`138`	`138`	`with patch.dict(vagrant.__utils__, {"sdb.sdb_get": mock_sdb_get}):`
`139`	`139`	`assert vagrant.destroy("test4")`
`140`	`140`	`mock_sdb.assert_any_call(`
`141`		`- "sdb://vagrant_sdb_data/macfour?{}".format(path_mydir),`
	`141`	`+ f"sdb://vagrant_sdb_data/macfour?{path_mydir}",`
`142`	`142`	`local_opts,`
`143`	`143`	`)`
`144`	`144`	`mock_sdb.assert_any_call("sdb://vagrant_sdb_data/test4", local_opts)`