Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: Call t.remove and g.remove once with multiple inputs as list #4523

Merged
merged 8 commits into from
Oct 18, 2024
Merged

tests: Call t.remove and g.remove once with multiple inputs as list #4523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f5ca70
t.rast.accumulate: Call t.remove with multiple inputs in test_accumul…
echoix Oct 6, 2024
62f8905
t.rast.accdetect: Call t.remove with multiple inputs
echoix Oct 7, 2024
ae19dbe
t.rast.univar: Call t.remove once with multiple inputs
echoix Oct 14, 2024
e1213e9
tests: Call g.remove once with multiple names to remove
echoix Oct 14, 2024
4d0e81c
benchmark: Call g.remove once with multiple names to remove
echoix Oct 14, 2024
7b4aedd
utils/thumbnails: Call g.remove once with multiple names to remove
echoix Oct 14, 2024
f81a7f6
Use tuple for supplying multiple input maps
echoix Oct 17, 2024
aa0a1dd
Merge branch 'main' into remove-multiple-layers
echoix Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions imagery/i.gensig/testsuite/test_i_gensig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,13 @@ def tearDownClass(cls):
"""Remove the temporary region and generated data"""
cls.del_temp_region()
shutil.rmtree(cls.sig_dir1, ignore_errors=True)
cls.runModule("g.remove", flags="f", type="raster", name=cls.b1, quiet=True)
cls.runModule("g.remove", flags="f", type="raster", name=cls.b2, quiet=True)
cls.runModule("g.remove", flags="f", type="raster", name=cls.train, quiet=True)
cls.runModule(
"g.remove",
flags="f",
type="raster",
name=(cls.b1, cls.b2, cls.train),
quiet=True,
)

def test_creation(self):
"""Test creating a signature"""
Expand Down
11 changes: 5 additions & 6 deletions imagery/i.maxlik/testsuite/test_i_maxlik.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ def tearDownClass(cls):
cls.del_temp_region()
shutil.rmtree(cls.sig_dir1, ignore_errors=True)
shutil.rmtree(cls.sig_dir2, ignore_errors=True)
cls.runModule("g.remove", flags="f", type="raster", name=cls.b1, quiet=True)
cls.runModule("g.remove", flags="f", type="raster", name=cls.b2, quiet=True)
cls.runModule(
"g.remove", flags="f", type="raster", name=cls.v1_class, quiet=True
)
cls.runModule(
"g.remove", flags="f", type="raster", name=cls.v2_class, quiet=True
"g.remove",
flags="f",
type="raster",
name=(cls.b1, cls.b2, cls.v1_class, cls.v2_class),
quiet=True,
)
cls.runModule("g.remove", flags="f", type="group", name=cls.group, quiet=True)

Expand Down
14 changes: 6 additions & 8 deletions imagery/i.vi/testsuite/test_vi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
cls.runModule("g.remove", flags="f", type="raster", name="ipvi")
cls.runModule("g.remove", flags="f", type="raster", name="ndwi")
cls.runModule("g.remove", flags="f", type="raster", name="dvi")
cls.runModule("g.remove", flags="f", type="raster", name="sr")
cls.runModule("g.remove", flags="f", type="raster", name="evi")
cls.runModule("g.remove", flags="f", type="raster", name="evi2")
cls.runModule("g.remove", flags="f", type="raster", name="gari")
cls.runModule("g.remove", flags="f", type="raster", name="gemi")
cls.runModule(
"g.remove",
flags="f",
type="raster",
name="ipvi,ndwi,dvi,sr,evi,evi2,gari,gemi",
)
cls.del_temp_region()

def test_vinameipvi(self):
Expand Down
9 changes: 6 additions & 3 deletions lib/imagery/testsuite/test_imagery_sigfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,12 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
cls.runModule("g.remove", flags="f", type="raster", name=cls.map1)
cls.runModule("g.remove", flags="f", type="raster", name=cls.map2)
cls.runModule("g.remove", flags="f", type="raster", name=cls.map3)
cls.runModule(
"g.remove",
flags="f",
type="raster",
name=(cls.map1, cls.map2, cls.map3),
)

def test_symmetric_complete_difference(self):
# Prepare imagery group reference struct
Expand Down
9 changes: 6 additions & 3 deletions lib/imagery/testsuite/test_imagery_sigsetfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,12 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
cls.runModule("g.remove", flags="f", type="raster", name=cls.map1)
cls.runModule("g.remove", flags="f", type="raster", name=cls.map2)
cls.runModule("g.remove", flags="f", type="raster", name=cls.map3)
cls.runModule(
"g.remove",
flags="f",
type="raster",
name=(cls.map1, cls.map2, cls.map3),
)

def test_symmetric_complete_difference(self):
# Prepare imagery group reference struct
Expand Down
7 changes: 4 additions & 3 deletions raster/r.contour/testsuite/test_r_contour.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ def setUpClass(cls):
def tearDownClass(cls):
cls.del_temp_region()

cls.runModule("g.remove", type="vector", flags="f", name=cls.output)
cls.runModule("g.remove", type="vector", flags="f", name=cls.output + "_cut")
cls.runModule(
"g.remove", type="vector", flags="f", name=cls.output + "_cut_flag_t"
"g.remove",
type="vector",
flags="f",
name=(cls.output, cls.output + "_cut", cls.output + "_cut_flag_t"),
)

if os.path.isfile("testReport"):
Expand Down
8 changes: 6 additions & 2 deletions raster/r.in.pdal/testsuite/test_r_in_pdal_binning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,12 @@ def tearDown(self):

This is executed after each test run.
"""
self.runModule("g.remove", flags="f", type="raster", name=self.bin_raster)
self.runModule("g.remove", flags="f", type="raster", name=self.ref_raster)
self.runModule(
"g.remove",
flags="f",
type="raster",
name=(self.bin_raster, self.ref_raster),
)

@unittest.skipIf(shutil.which("r.in.pdal") is None, "Cannot find r.in.pdal")
def test_method_n(self):
Expand Down
8 changes: 6 additions & 2 deletions raster/r.in.pdal/testsuite/test_r_in_pdal_selection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ def tearDown(self):

This is executed after each test run.
"""
self.runModule("g.remove", flags="f", type="raster", name=self.imp_raster)
self.runModule("g.remove", flags="f", type="raster", name=self.ref_raster)
self.runModule(
"g.remove",
flags="f",
type="raster",
name=(self.imp_raster, self.ref_raster),
)
try:
self.runModule("g.remove", flags="f", type="raster", name=self.base_raster)
except AttributeError:
Expand Down
15 changes: 9 additions & 6 deletions raster/r.kappa/testsuite/test_r_kappa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ def setUpClass(cls):
def tearDownClass(cls):
"""Remove temporary data"""
cls.del_temp_region()
cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
cls.runModule(
"g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
)

def test_m(self):
"""Test printing matrix only
Expand Down Expand Up @@ -119,8 +120,9 @@ def setUpClass(cls):
def tearDownClass(cls):
"""Remove temporary data"""
cls.del_temp_region()
cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
cls.runModule(
"g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
)

def match(self, pat, ref):
if pat == "NA" or ref == "NA":
Expand Down Expand Up @@ -233,8 +235,9 @@ def setUpClass(cls):
def tearDownClass(cls):
"""Remove temporary data"""
cls.del_temp_region()
cls.runModule("g.remove", flags="f", type="raster", name=cls.ref_1)
cls.runModule("g.remove", flags="f", type="raster", name=cls.class_1)
cls.runModule(
"g.remove", flags="f", type="raster", name=(cls.ref_1, cls.class_1)
)

def match(self, pat, ref):
if pat == "NA" or ref == "NA":
Expand Down
3 changes: 1 addition & 2 deletions raster/r.mfilter/benchmark/benchmark_r_mfilter_nprocs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
3 changes: 1 addition & 2 deletions raster/r.neighbors/benchmark/benchmark_r_neighbors_nprocs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
28 changes: 14 additions & 14 deletions raster/r.random/testsuite/test_r_random.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,30 @@ def setUpClass(cls):
def tearDownClass(cls):
cls.del_temp_region()

cls.runModule("g.remove", type="raster", flags="f", name=cls.raster)
cls.runModule("g.remove", type="raster", flags="f", name=cls.raster + "_null")
cls.runModule(
"g.remove", type="raster", flags="f", name=cls.raster + "_without_topology"
)
cls.runModule("g.remove", type="raster", flags="f", name=cls.raster + "_3D")
cls.runModule(
"g.remove",
type="raster",
flags="f",
name=cls.raster + "_cover_landcover_1m",
name=(
cls.raster,
cls.raster + "_null",
cls.raster + "_without_topology",
cls.raster + "_3D",
cls.raster + "_cover_landcover_1m",
),
)

cls.runModule("g.remove", type="vector", flags="f", name=cls.vector)
cls.runModule("g.remove", type="vector", flags="f", name=cls.vector + "_null")
cls.runModule(
"g.remove", type="vector", flags="f", name=cls.vector + "_without_topology"
)
cls.runModule("g.remove", type="vector", flags="f", name=cls.vector + "_3D")
cls.runModule(
"g.remove",
type="vector",
flags="f",
name=cls.vector + "_cover_landcover_1m",
name=(
cls.vector,
cls.vector + "_null",
cls.vector + "_without_topology",
cls.vector + "_3D",
cls.vector + "_cover_landcover_1m",
),
)

def test_random_raster(self):
Expand Down
3 changes: 1 addition & 2 deletions raster/r.resamp.filter/benchmark/benchmark_r_resamp_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=8, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
3 changes: 1 addition & 2 deletions raster/r.resamp.interp/benchmark/benchmark_r_resamp_interp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
3 changes: 1 addition & 2 deletions raster/r.series/benchmark/benchmark_r_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
12 changes: 7 additions & 5 deletions raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=slope)
Module("g.remove", quiet=True, flags="f", type="raster", name=aspect)
Module("g.remove", quiet=True, flags="f", type="raster", name=pcurv)
Module("g.remove", quiet=True, flags="f", type="raster", name=tcurv)
Module(
"g.remove",
quiet=True,
flags="f",
type="raster",
name=(reference, slope, aspect, pcurv, tcurv),
)


def generate_map(rows, cols, fname):
Expand Down
11 changes: 7 additions & 4 deletions raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ def benchmark(memory, label, results, reference):
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=20, repeat=10))

Module("g.remove", quiet=True, flags="f", type="raster", name=slope)
Module("g.remove", quiet=True, flags="f", type="raster", name=aspect)
Module("g.remove", quiet=True, flags="f", type="raster", name=pcurv)
Module("g.remove", quiet=True, flags="f", type="raster", name=tcurv)
Module(
"g.remove",
quiet=True,
flags="f",
type="raster",
name=(slope, aspect, pcurv, tcurv),
)


def generate_map(rows, cols, fname):
Expand Down
42 changes: 10 additions & 32 deletions raster/r.tile/testsuite/test_r_tile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,20 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
cls.runModule(
"g.remove", type="raster", flags="f", name=cls.output_prefix + "-000-000"
)
cls.runModule(
"g.remove", type="raster", flags="f", name=cls.output_prefix + "-000-001"
)
cls.runModule(
"g.remove", type="raster", flags="f", name=cls.output_prefix + "-001-000"
)
cls.runModule(
"g.remove", type="raster", flags="f", name=cls.output_prefix + "-001-001"
)

cls.runModule(
"g.remove",
type="raster",
flags="f",
name=cls.output_prefix + "overlap" + "-000-000",
)
cls.runModule(
"g.remove",
type="raster",
flags="f",
name=cls.output_prefix + "overlap" + "-000-001",
)
cls.runModule(
"g.remove",
type="raster",
flags="f",
name=cls.output_prefix + "overlap" + "-001-000",
)
cls.runModule(
"g.remove",
type="raster",
flags="f",
name=cls.output_prefix + "overlap" + "-001-001",
name=(
cls.output_prefix + "-000-000",
cls.output_prefix + "-000-001",
cls.output_prefix + "-001-000",
cls.output_prefix + "-001-001",
cls.output_prefix + "overlap" + "-000-000",
cls.output_prefix + "overlap" + "-000-001",
cls.output_prefix + "overlap" + "-001-000",
cls.output_prefix + "overlap" + "-001-001",
),
)

def test_raster_tile(self):
Expand Down
3 changes: 1 addition & 2 deletions raster/r.univar/benchmark/benchmark_r_univar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ def benchmark(size, label, results):
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)
Module("g.remove", quiet=True, flags="f", type="raster", name=(reference, output))


def generate_map(rows, cols, fname):
Expand Down
11 changes: 6 additions & 5 deletions raster/r.univar/testsuite/test_r_univar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ def tearDownClass(cls):
cls.del_temp_region()

def tearDown(self):
self.runModule("g.remove", flags="f", type="raster", name="map_a")
self.runModule("g.remove", flags="f", type="raster", name="map_b")
self.runModule("g.remove", flags="f", type="raster", name="map_negative")
self.runModule("g.remove", flags="f", type="raster", name="zone_map")
self.runModule("g.remove", flags="f", type="raster", name="zone_map_with_gap")
self.runModule(
"g.remove",
flags="f",
type="raster",
name="map_a,map_b,map_negative,zone_map,zone_map_with_gap",
)

def setUp(self):
"""Create input data"""
Expand Down
9 changes: 1 addition & 8 deletions raster3d/r3.null/testsuite/test.r3.null.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,7 @@ diff data/test_volume_double_null_1.ref test_volume_double_null_1.txt
diff data/test_volume_double_null_2.ref test_volume_double_null_2.txt

# Cleanup
g.remove -f type=raster_3d name=test_volume_float_1
g.remove -f type=raster_3d name=test_volume_float_2
g.remove -f type=raster_3d name=test_volume_float_null_1
g.remove -f type=raster_3d name=test_volume_float_null_2
g.remove -f type=raster_3d name=test_volume_double_1
g.remove -f type=raster_3d name=test_volume_double_2
g.remove -f type=raster_3d name=test_volume_double_null_1
g.remove -f type=raster_3d name=test_volume_double_null_2
g.remove -f type=raster_3d name=test_volume_float_1,test_volume_float_2,test_volume_float_null_1,test_volume_float_null_2,test_volume_double_1,test_volume_double_2,test_volume_double_null_1,test_volume_double_null_2
rm test_volume_float_1.txt
rm test_volume_float_2.txt
rm test_volume_float_null_1.txt
Expand Down
Loading
Loading