From 1f509c59da0d38ab70b3ba8986dcef3d9c620fa3 Mon Sep 17 00:00:00 2001 From: Andy Salnikov Date: Sat, 21 Oct 2023 20:14:31 -0700 Subject: [PATCH] Update test to use SqlRegistry instead of Registry (DM-41235) --- tests/test_instrument.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/test_instrument.py b/tests/test_instrument.py index 0dfbc315c..2802f5e20 100644 --- a/tests/test_instrument.py +++ b/tests/test_instrument.py @@ -32,8 +32,9 @@ import math import unittest -from lsst.daf.butler import DataCoordinate, DimensionPacker, DimensionUniverse, Registry, RegistryConfig +from lsst.daf.butler import DataCoordinate, DimensionPacker, DimensionUniverse, RegistryConfig from lsst.daf.butler.formatters.json import JsonFormatter +from lsst.daf.butler.registry.sql_registry import SqlRegistry from lsst.pex.config import Config from lsst.pipe.base import Instrument from lsst.utils.introspection import get_full_type_name @@ -124,7 +125,7 @@ def test_register(self): """Test that register() sets appropriate Dimensions.""" registryConfig = RegistryConfig() registryConfig["db"] = "sqlite://" - registry = Registry.createFromConfig(registryConfig) + registry = SqlRegistry.createFromConfig(registryConfig) # Check that the registry starts out empty. self.instrument.importAll(registry) self.assertFalse(list(registry.queryDimensionRecords("instrument"))) @@ -205,7 +206,7 @@ def test_dimension_packer_config_defaults(self): """ registry_config = RegistryConfig() registry_config["db"] = "sqlite://" - registry = Registry.createFromConfig(registry_config) + registry = SqlRegistry.createFromConfig(registry_config) self.instrument.register(registry) config = DimensionPackerTestConfig() instrument_data_id = registry.expandDataId(instrument=self.name) @@ -238,7 +239,7 @@ def test_dimension_packer_config_override(self): """ registry_config = RegistryConfig() registry_config["db"] = "sqlite://" - registry = Registry.createFromConfig(registry_config) + registry = SqlRegistry.createFromConfig(registry_config) # Intentionally do not register instrument or insert any other # dimension records to ensure we don't need them in this mode. config = DimensionPackerTestConfig()