浏览代码

testsuite: fix libgis/parser_json.c and r.fillnull (#1346)

Fixes broken tests.
Markus Neteler 4 年之前
父节点
当前提交
b9e807701e
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 1 3
      lib/gis/testsuite/test_parser_json.py
  2. 1 2
      scripts/r.fillnulls/testsuite/test_r_fillnulls.py

+ 1 - 3
lib/gis/testsuite/test_parser_json.py

@@ -22,9 +22,7 @@ class TestParserJson(TestCase):
                 "aspect=aspect+GTiff", "--json"]
 
         inputs = [
-            {"import_descr": {"source": "https://storage.googleapis.com/graas-geodata/elev_ned_30m.tif",
-                              "type": "raster"},
-             "param": "elevation", "value": "elevation"},
+            {"param": "elevation", "value": "elevation+https://storage.googleapis.com/graas-geodata/elev_ned_30m.tif"},
             {"param": "format", "value": "degrees"},
             {"param": "precision", "value": "FCELL"},
             {"param": "zscale", "value": "1.0"},

+ 1 - 2
scripts/r.fillnulls/testsuite/test_r_fillnulls.py

@@ -14,8 +14,7 @@ from grass.script.core import run_command
 class TestRFillNulls(TestCase):
     """Test r.fillnulls script"""
 
-    module_dir = os.path.dirname(os.path.dirname(__file__))
-    module = os.path.join(module_dir, 'r.fillnulls')
+    module = 'r.fillnulls'
     mapName = 'elevation'
     expression = 'elevation_filt = if(elevation > 130, \
     null(), elevation)'