tidy

Author: marqh

lib/bald/tests/integration/test_cdl.py

@@ -28,49 +28,3 @@ def atest(self):
                 self.assertTrue(validation.is_valid(), msg='{} != []'.format(exns))
         return atest
     setattr(Test, 'test_{}'.format(file_id), make_a_test(cdl_file))
-
-
-# def test_ereefs_gbr4_ncld(self):
-#     """Override ereefs test with currently accepted failures"""
-#     with self.temp_filename('.nc') as tfile:
-#         cdl_file = os.path.join(self.cdl_path, 'ereefs_gbr4_ncld.cdl')
-#         subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
-#         validation = bald.validate_netcdf(tfile, cache=self.acache)
-#         exns = validation.exceptions()
-#         exns.sort()
-#         # expected = ['http://qudt.org/vocab/unit#Meter is not resolving as a resource (404).',
-#         #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
-#         #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
-#         #             'http://qudt.org/vocab/unit#DegreeCelsius is not resolving as a resource (404).']
-#         # expected.sort()
-#         # self.assertTrue(not validation.is_valid() and exns == expected,
-#         #                 msg='{} \n!= \n{}'.format(exns, expected))
-#         self.assertTrue(not validation.is_valid())
-
-# setattr(Test, 'test_ereefs_gbr4_ncld', test_ereefs_gbr4_ncld)
-
-
-# def test_ProcessChain0300(self):
-#     """Override ProcessChain 0300 test with currently accepted failures"""
-#     self.assertTrue(True)
-
-# setattr(Test, 'test_ProcessChain0300', test_ProcessChain0300)
-
-
-# def test_grid_OISST_GHRSST(self):
-#     """Override grid OISST GHRSST test with currently accepted failures"""
-#     with self.temp_filename('.nc') as tfile:
-#         cdl_file = os.path.join(self.cdl_path, 'grid_OISST_GHRSST.cdl')
-#         subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
-#         validation = bald.validate_netcdf(tfile, cache=self.acache)
-#         exns = validation.exceptions()
-#         self.assertTrue(validation.is_valid(), msg='{}  != []'.format(exns))
-#         # exns.sort()
-#         # expected = ['http://doi.org/10.7289/V5SQ8XB5 is not resolving as a resource (404).',
-#         #             'http://www.ncdc.noaa.gov/sst is not resolving as a resource (404).',
-#         #             'http://www.ncdc.noaa.gov/sst/ is not resolving as a resource (404).']
-#         # expected.sort()
-#         # self.assertTrue(not validation.is_valid() and exns == expected,
-#         #                 msg='{} \n!= \n{}'.format(exns, expected))
-
-# setattr(Test, 'test_grid_OISST_GHRSST', test_grid_OISST_GHRSST)

lib/bald/tests/integration/test_netcdf.py

@@ -49,14 +49,13 @@ def test_invalid_uri(self):
             f = _fattrs(f)
             setattr(f, 'bald__turtle', 'bald__walnut')
             f.close()
-            validation = bald.validate_netcdf(tfile, cache=self.acache)
+            validation = bald.validate_netcdf(tfile, cache=self.acache,
+                                              uris_resolve=True)
             exns = validation.exceptions()
-            self.assertTrue(validation.is_valid(), msg='{}  != []'.format(exns))
-            # expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
-            #             'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']
-            # self.assertTrue((not validation.is_valid()) and exns == expected,
-            #                  msg='{}  != {}'.format(exns, expected))
-
+            expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
+                        'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']
+            self.assertTrue((not validation.is_valid()) and exns == expected,
+                             msg='{}  != {}'.format(exns, expected))
 
 class TestArrayReference(BaldTestCase):
     def test_match(self):