DM-22364: Allow makeRepo returned Config to be used to create Butler

python/lsst/daf/butler/core/config.py

@@ -195,6 +195,7 @@ def __init__(self, other=None):
 
         if isinstance(other, Config):
             self._data = copy.deepcopy(other._data)
+            self.configFile = other.configFile
         elif isinstance(other, collections.abc.Mapping):
             self.update(other)
         elif isinstance(other, str):
@@ -814,9 +815,14 @@ def dumpToFile(self, path):
         ----------
         path : `str`
             Path to the file to use for output.
+
+        Notes
+        -----
+        The name of the config file is stored in the Config object.
         """
         with open(path, "w") as f:
             self.dump(f)
+        self.configFile = path
 
     def dumpToS3File(self, bucket, key):
         """Writes the config to a file in S3 Bucket.

tests/test_butler.py

@@ -388,13 +388,13 @@ def testMakeRepo(self):
         # Remove the file created in setUp
         os.unlink(self.tmpConfigFile)
 
-        Butler.makeRepo(self.root, config=Config(self.configFile))
+        butlerConfig = Butler.makeRepo(self.root, config=Config(self.configFile))
         limited = Config(self.configFile)
-        butler1 = Butler(self.root, collection="ingest")
-        Butler.makeRepo(self.root, standalone=True, createRegistry=False,
-                        config=Config(self.configFile))
+        butler1 = Butler(butlerConfig, collection="ingest")
+        butlerConfig = Butler.makeRepo(self.root, standalone=True, createRegistry=False,
+                                       config=Config(self.configFile))
         full = Config(self.tmpConfigFile)
-        butler2 = Butler(self.root, collection="ingest")
+        butler2 = Butler(butlerConfig, collection="ingest")
         # Butlers should have the same configuration regardless of whether
         # defaults were expanded.
         self.assertEqual(butler1.config, butler2.config)

tests/test_sqlRegistry.py

@@ -722,7 +722,7 @@ def testInsertConflictSqlite(self):
             from lsst.daf.butler.registries.sqliteRegistry import InsertOnConflict
             from sqlalchemy.dialects import sqlite
         except ImportError:
-            self.skipTest("Test skiped, cannot find imports")
+            self.skipTest("Test skipped, cannot find imports for sqlite conflict testing")
 
         table = self.makeTestTable()
 
@@ -747,7 +747,7 @@ def testInsertConflictPG(self):
             from lsst.daf.butler.registries.postgresqlRegistry import PostgreSqlRegistry
             from sqlalchemy.dialects import postgresql
         except ImportError:
-            self.skipTest("Test skiped, cannot find imports")
+            self.skipTest("Test skipped, cannot find postgres imports")
 
         table = self.makeTestTable()
 
@@ -773,7 +773,7 @@ def testInsertConflictOracle(self):
         try:
             from sqlalchemy.dialects import oracle
         except ImportError:
-            self.skipTest("Test skiped, cannot find imports")
+            self.skipTest("Test skiped, cannot find Oracle imports")
 
         table = self.makeTestTable()