Skip to content

Commit

Permalink
Remove references to getInputDatasetTypes outside gen2tasks.
Browse files Browse the repository at this point in the history
  • Loading branch information
kfindeisen committed Sep 18, 2019
1 parent 084e29a commit 405c73b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion python/lsst/verify/tasks/ppdbMetricTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def run(self, dbInfo, outputDataId={}):
Parameters
----------
dbInfo
The dataset (of the type indicated by `getInputDatasetTypes`) from
The dataset (of the type indicated by the config) from
which to load the database.
outputDataId: any data ID type, optional
The output data ID for the metric value. Defaults to the empty ID,
Expand Down
8 changes: 0 additions & 8 deletions python/lsst/verify/tasks/testUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ class MetadataMetricTestCase(MetricTaskTestCase):
being tested.
"""

def testInputDatasetTypes(self):
defaultInputs = self.taskClass.getInputDatasetTypes(self.task.config)
self.assertEqual(defaultInputs.keys(), {"metadata"})

@staticmethod
def _takesScalarMetadata(task):
return task.areInputDatasetsScalar(task.config)['metadata']
Expand Down Expand Up @@ -126,10 +122,6 @@ class DummyConfig(Config):

return DummyConfig()

def testInputDatasetTypes(self):
defaultInputs = self.taskClass.getInputDatasetTypes(self.task.config)
self.assertEqual(defaultInputs.keys(), {"dbInfo"})

def testValidRun(self):
info = self.makeDbInfo()
with patch.object(self.task, "makeMeasurement") as mockWorkhorse:
Expand Down
12 changes: 0 additions & 12 deletions tests/test_commonMetrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,6 @@ def testBadlyTypedKeys(self):
with self.assertRaises(MetricComputationError):
task.run(metadata)

def testGetInputDatasetTypes(self):
types = TimingMetricTask.getInputDatasetTypes(self.config)
self.assertSetEqual(set(types.keys()), {"metadata"})
expected = DummyTask._DefaultName + "_metadata"
self.assertEqual(types["metadata"], expected)

def testGetOutputMetricName(self):
self.assertEqual(TimingMetricTask.getOutputMetricName(self.config),
Name(self.config.metric))
Expand Down Expand Up @@ -185,12 +179,6 @@ def testBadlyTypedKeys(self):
with self.assertRaises(MetricComputationError):
task.run(metadata)

def testGetInputDatasetTypes(self):
types = MemoryMetricTask.getInputDatasetTypes(self.config)
self.assertSetEqual(set(types.keys()), {"metadata"})
expected = DummyTask._DefaultName + "_metadata"
self.assertEqual(types["metadata"], expected)

def testGetOutputMetricName(self):
self.assertEqual(MemoryMetricTask.getOutputMetricName(self.config),
Name(self.config.metric))
Expand Down

0 comments on commit 405c73b

Please sign in to comment.