Skip to content

Commit

Permalink
Merge pull request #445 from lsst/tickets/DM-46298
Browse files Browse the repository at this point in the history
DM-46298: Stop using private Butler clone method
  • Loading branch information
dhirving authored Sep 16, 2024
2 parents 8292ef4 + a733e32 commit dccb6f9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/test_init_output_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def init_with_pipeline_graph_first(
using the former to actually write init-outputs (with later attempts
correctly failing or doing nothing, depending on parameters).
"""
butler = butler._clone(run=run, collections=[self.INPUT_COLLECTION, run])
butler = butler.clone(run=run, collections=[self.INPUT_COLLECTION, run])
pipeline_graph.init_output_run(butler)
init_output_refs = self.find_init_output_refs(pipeline_graph, butler)
# Build a QG with the init outputs already in place.
Expand Down Expand Up @@ -264,7 +264,7 @@ def init_with_quantum_graph_first(
using the latter to actually write init-outputs (with later attempts
correctly failing or doing nothing, depending on parameters).
"""
butler = butler._clone(run=run, collections=[self.INPUT_COLLECTION, run])
butler = butler.clone(run=run, collections=[self.INPUT_COLLECTION, run])
# Build a QG.
quantum_graph_builder = AllDimensionsQuantumGraphBuilder(
pipeline_graph,
Expand Down Expand Up @@ -316,7 +316,7 @@ def init_with_qbb_first(self, pipeline_graph: PipelineGraph, butler: Butler, run
(with later attempts correctly failing or doing nothing, depending on
parameters).
"""
butler = butler._clone(run=run, collections=[self.INPUT_COLLECTION, run])
butler = butler.clone(run=run, collections=[self.INPUT_COLLECTION, run])
# Build a QG.
quantum_graph_builder = AllDimensionsQuantumGraphBuilder(
pipeline_graph,
Expand Down Expand Up @@ -512,7 +512,7 @@ def test_config_change(self) -> None:
butler.put(DynamicTestPipelineTaskConfig(), "a_config", run="run1")
with self.assertRaises(ConflictingDefinitionError):
pipeline_graph.init_output_run(
butler._clone(run="run1", collections=[self.INPUT_COLLECTION, "run1"])
butler.clone(run="run1", collections=[self.INPUT_COLLECTION, "run1"])
)
quantum_graph_builder = AllDimensionsQuantumGraphBuilder(
pipeline_graph,
Expand All @@ -526,7 +526,7 @@ def test_config_change(self) -> None:
)
with self.assertRaises(ConflictingDefinitionError):
quantum_graph.init_output_run(
butler._clone(run="run1", collections=[self.INPUT_COLLECTION, "run1"])
butler.clone(run="run1", collections=[self.INPUT_COLLECTION, "run1"])
)


Expand Down

0 comments on commit dccb6f9

Please sign in to comment.