adjust tests

Author: metzm

python/grass/app/tests/grass_app_cli_run_pack_test.py

@@ -65,8 +65,9 @@ def test_run_with_crs_as_pack_as_output(tmp_path, epsg_code, extension):
         text=True,
         check=True,
     )
-    assert json.loads(result.stdout)["id"]["authority"] == "EPSG"
-    assert json.loads(result.stdout)["id"]["code"] == epsg_code
+    result_dict = json.loads(result.stdout)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == epsg_code
 
 
 def test_run_with_crs_as_pack_with_multiple_steps(tmp_path):

python/grass/app/tests/grass_app_cli_test.py

@@ -63,8 +63,9 @@ def test_subcommand_run_tool_failure_run():
 def test_subcommand_run_with_crs_as_epsg(capfd):
     """Check that CRS provided as EPSG is applied"""
     assert main(["run", "--crs", "EPSG:3358", "g.proj", "-p", "format=json"]) == 0
-    assert json.loads(capfd.readouterr().out)["id"]["authority"] == "EPSG"
-    assert json.loads(capfd.readouterr().out)["id"]["code"] == 3358
+    result_dict = json.loads(capfd.readouterr().out)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == 3358
 
 
 def test_subcommand_run_with_crs_as_epsg_subprocess():
@@ -85,8 +86,9 @@ def test_subcommand_run_with_crs_as_epsg_subprocess():
         text=True,
         check=True,
     )
-    assert json.loads(result.stdout)["id"]["authority"] == "EPSG"
-    assert json.loads(result.stdout)["id"]["code"] == 3358
+    result_dict = json.loads(result.stdout)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == 3358
 
 
 @pytest.mark.skipif(
@@ -107,8 +109,9 @@ def test_subcommand_run_with_crs_as_pack(pack_raster_file4x5_rows, capfd):
         )
         == 0
     )
-    assert json.loads(capfd.readouterr().out)["id"]["authority"] == "EPSG"
-    assert json.loads(capfd.readouterr().out)["id"]["code"] == 3358
+    result_dict = json.loads(capfd.readouterr().out)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == 3358
 
 
 def test_subcommand_run_with_crs_as_pack_subprocess(pack_raster_file4x5_rows, capfd):
@@ -129,8 +132,9 @@ def test_subcommand_run_with_crs_as_pack_subprocess(pack_raster_file4x5_rows, ca
         text=True,
         check=True,
     )
-    assert json.loads(result.stdout)["id"]["authority"] == "EPSG"
-    assert json.loads(result.stdout)["id"]["code"] == 3358
+    result_dict = json.loads(result.stdout)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == 3358
 
 
 def test_create_lock_unlock(tmp_path):
@@ -209,8 +213,9 @@ def test_create_mapset(tmp_path):
         text=True,
         check=True,
     )
-    assert json.loads(result.stdout)["id"]["authority"] == "EPSG"
-    assert json.loads(result.stdout)["id"]["code"] == 3358
+    result_dict = json.loads(result.stdout)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == 3358
     # And check that we are really using the newly created mapset,
     # so the computational region in the default mapset is different.
     result = subprocess.run(
@@ -273,5 +278,6 @@ def test_create_crs_epsg(tmp_path, epsg_code):
         text=True,
         check=True,
     )
-    assert json.loads(result.stdout)["id"]["authority"] == "EPSG"
-    assert json.loads(result.stdout)["id"]["code"] == epsg_code
+    result_dict = json.loads(result.stdout)
+    assert result_dict["id"]["authority"] == "EPSG"
+    assert result_dict["id"]["code"] == epsg_code

python/grass/grassdb/tests/grass_grassdb_create_from_pack_test.py

@@ -23,8 +23,9 @@ def test_path_types(
         gs.setup.init(path, env=os.environ.copy()) as session,
         Tools(session=session) as tools,
     ):
-        assert tools.g_proj(flags="p", format="json")["id"]["authority"] == "EPSG"
-        assert tools.g_proj(flags="p", format="json")["id"]["code"] == 3358
+        result_dict = tools.g_proj(flags="p", format="json")
+        assert result_dict["id"]["authority"] == "EPSG"
+        assert result_dict["id"]["code"] == 3358
 
 
 def test_set_crs_in_xy(tmp_path, pack_raster_file4x5_rows):
@@ -45,8 +46,9 @@ def test_set_crs_in_xy(tmp_path, pack_raster_file4x5_rows):
         gs.setup.init(project, env=os.environ.copy()) as session,
         Tools(session=session) as tools,
     ):
-        assert tools.g_proj(flags="p", format="json")["id"]["authority"] == "EPSG"
-        assert tools.g_proj(flags="p", format="json")["id"]["code"] == 3358
+        result_dict = tools.g_proj(flags="p", format="json")
+        assert result_dict["id"]["authority"] == "EPSG"
+        assert result_dict["id"]["code"] == 3358
         region = tools.g_region(flags="p", format="json")
         assert region["crs"]["type"] == "other"
         assert region["crs"]["type_code"] == 99

python/grass/tools/tests/grass_tools_session_tools_pack_test.py

@@ -710,8 +710,9 @@ def test_workflow_create_project_and_run_general_crs(
         Tools(session=session) as tools,
     ):
         assert tools.g_region(flags="p", format="json")["crs"]["type"] == "other"
-        assert tools.g_proj(flags="p", format="json")["id"]["authority"] == "EPSG"
-        assert tools.g_proj(flags="p", format="json")["id"]["code"] == 3358
+        result_dict = tools.g_proj(flags="p", format="json")
+        assert result_dict["id"]["authority"] == "EPSG"
+        assert result_dict["id"]["code"] == 3358
         tools.g_region(raster=ones_raster_file_epsg3358)
         assert tools.g_region(flags="p", format="json")["cells"] == 4 * 5
         tools.r_mapcalc_simple(
@@ -739,8 +740,9 @@ def test_workflow_create_project_and_run_ll_crs(
         Tools(session=session) as tools,
     ):
         assert tools.g_region(flags="p", format="json")["crs"]["type"] == "ll"
-        assert tools.g_proj(flags="p", format="json")["id"]["authority"] == "EPSG"
-        assert tools.g_proj(flags="p", format="json")["id"]["code"] == 4326
+        result_dict = tools.g_proj(flags="p", format="json")
+        assert result_dict["id"]["authority"] == "EPSG"
+        assert result_dict["id"]["code"] == 4326
         tools.g_region(raster=ones_raster_file_epsg4326)
         assert tools.g_region(flags="p", format="json")["cells"] == 4 * 5
         tools.r_mapcalc_simple(