From 08306bad57761b5eb176894649ac7d4e735c52dd Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 13 Mar 2023 18:38:23 +0100 Subject: Fixed #34411 -- Updated GDAL API to handle vector DataSource's. Co-authored-by: David Smith --- tests/gis_tests/gdal_tests/test_driver.py | 35 +++++++++++-------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/gis_tests/gdal_tests/test_driver.py b/tests/gis_tests/gdal_tests/test_driver.py index e7c03ae98d..0d9423bc85 100644 --- a/tests/gis_tests/gdal_tests/test_driver.py +++ b/tests/gis_tests/gdal_tests/test_driver.py @@ -54,32 +54,21 @@ class DriverTest(unittest.TestCase): dr = Driver(alias) self.assertEqual(full_name, str(dr)) - @mock.patch("django.contrib.gis.gdal.driver.vcapi.get_driver_count") - @mock.patch("django.contrib.gis.gdal.driver.rcapi.get_driver_count") - @mock.patch("django.contrib.gis.gdal.driver.vcapi.register_all") - @mock.patch("django.contrib.gis.gdal.driver.rcapi.register_all") - def test_registered(self, rreg, vreg, rcount, vcount): + @mock.patch("django.contrib.gis.gdal.driver.capi.get_driver_count") + @mock.patch("django.contrib.gis.gdal.driver.capi.register_all") + def test_registered(self, reg, count): """ - Prototypes are registered only if their respective driver counts are - zero. + Prototypes are registered only if the driver count is zero. """ - def check(rcount_val, vcount_val): - vreg.reset_mock() - rreg.reset_mock() - rcount.return_value = rcount_val - vcount.return_value = vcount_val + def check(count_val): + reg.reset_mock() + count.return_value = count_val Driver.ensure_registered() - if rcount_val: - self.assertFalse(rreg.called) + if count_val: + self.assertFalse(reg.called) else: - rreg.assert_called_once_with() - if vcount_val: - self.assertFalse(vreg.called) - else: - vreg.assert_called_once_with() + reg.assert_called_once_with() - check(0, 0) - check(120, 0) - check(0, 120) - check(120, 120) + check(0) + check(120) -- cgit v1.3