Skip to content

Commit bc5cb70

Browse files
authored
r3.info: fix test after r.mapcalc parallelization changes (#6137)
1 parent 27e76f7 commit bc5cb70

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

raster3d/r3.info/testsuite/test_r3_info.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def test_plain_output_default(self):
8989
" | |",
9090
" | Comments: |",
9191
' | r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\ |',
92-
' | on="current" |',
92+
' | on="current" nprocs=0 |',
9393
" | |",
9494
" +----------------------------------------------------------------------------+",
9595
"",
@@ -160,7 +160,7 @@ def test_shell_output_default(self):
160160
'source1=""',
161161
'source2=""',
162162
'description="generated by r3.mapcalc"',
163-
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current""',
163+
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current" nprocs=0"',
164164
]
165165
# Skip exact match for lines containing "project", "date", "creator", "database", "mapset" because
166166
# their values vary
@@ -212,7 +212,7 @@ def test_json_output_default(self):
212212
"source1": "",
213213
"source2": "",
214214
"description": "generated by r3.mapcalc",
215-
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current"',
215+
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current" nprocs=0',
216216
}
217217
self._assert_json_equal(result, expected)
218218

@@ -351,7 +351,7 @@ def test_shell_output_with_h_flag(self):
351351
'source1=""',
352352
'source2=""',
353353
'description="generated by r3.mapcalc"',
354-
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current""',
354+
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current" nprocs=0"',
355355
]
356356
self.assertEqual(result, expected)
357357

@@ -372,7 +372,7 @@ def test_plain_output_with_h_flag(self):
372372
" generated by r3.mapcalc",
373373
"Comments:",
374374
' r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\',
375-
' on="current"',
375+
' on="current" nprocs=0',
376376
]
377377
self.assertEqual(result, expected)
378378

@@ -392,7 +392,7 @@ def test_json_output_with_h_flag(self):
392392
"source1": "",
393393
"source2": "",
394394
"description": "generated by r3.mapcalc",
395-
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current"',
395+
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current" nprocs=0',
396396
}
397397
self._assert_json_equal(result, expected, False)
398398

@@ -432,7 +432,7 @@ def test_combined_flags_shell_output(self):
432432
'source1=""',
433433
'source2=""',
434434
'description="generated by r3.mapcalc"',
435-
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current""',
435+
'comments="r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\on="current" nprocs=0"',
436436
]
437437
self.assertEqual(result, expected)
438438

@@ -481,7 +481,7 @@ def test_combined_flags_plain_output(self):
481481
" generated by r3.mapcalc",
482482
"Comments:",
483483
' r3.mapcalc expression="test_raster3d = row() + col() + depth()" regi\\',
484-
' on="current"',
484+
' on="current" nprocs=0',
485485
]
486486
self.assertEqual(result, expected)
487487

@@ -519,7 +519,7 @@ def test_combined_flags_json_output(self):
519519
"source1": "",
520520
"source2": "",
521521
"description": "generated by r3.mapcalc",
522-
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current"',
522+
"comments": 'r3.mapcalc expression="test_raster3d = row() + col() + depth()" region="current" nprocs=0',
523523
}
524524
self._assert_json_equal(result, expected, False)
525525

0 commit comments

Comments
 (0)