From de12813ba14c36450cdeba0d174866bfa5f153c5 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Thu, 13 Feb 2020 14:41:27 -0500
Subject: [PATCH] Fix failing tests in AddSampleLogMultipleTest
Signed-off-by: Steven Hahn <hahnse@ornl.gov>
---
.../AddSampleLogMultiple.py | 2 +-
.../AddSampleLogMultipleTest.py | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
index ae5380589bb..871ad86ef57 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
@@ -93,7 +93,7 @@ class AddSampleLogMultiple(PythonAlgorithm):
num_names = len(log_names)
num_values = len(log_values)
num_units = len(log_units)
- num_types = len(num_types)
+ num_types = len(log_types)
# Ensure there is at least 1 log name
if num_names == 0:
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
index 05055fadbe7..c4f7e55be28 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
@@ -84,7 +84,7 @@ class AddSampleLogMultipleTest(unittest.TestCase):
AddSampleLogMultiple(Workspace=self._workspace,
LogNames=names,
LogValues=values,
- ParseTypes=False,
+ ParseType=False,
LogTypes=types
)
@@ -116,8 +116,8 @@ class AddSampleLogMultipleTest(unittest.TestCase):
AddSampleLogMultiple(Workspace=self._workspace,
LogNames=names,
- LogValues=values
- ParseTypes=False,
+ LogValues=values,
+ ParseType=False,
LogTypes=types)
self._validate_sample_logs(names, values, types)
@@ -195,7 +195,7 @@ class AddSampleLogMultipleTest(unittest.TestCase):
LogValues=values)
- def test_validation_differing_types(self):
+ def test_validation_differing_types(self):
"""
Test validation for differing numbers of log names and log types.
"""
@@ -206,12 +206,12 @@ class AddSampleLogMultipleTest(unittest.TestCase):
AddSampleLogMultiple,
Workspace=self._workspace,
LogNames=names,
- LogValues=values
- ParseTypes=True,
+ LogValues=values,
+ ParseType=True,
LogTypes=types)
- def test_validation_differing_types(self):
+ def test_validation_differing_types(self):
"""
Test validation for differing numbers of log names and log types.
"""
@@ -223,12 +223,12 @@ class AddSampleLogMultipleTest(unittest.TestCase):
AddSampleLogMultiple,
Workspace=self._workspace,
LogNames=names,
- LogValues=values
- ParseTypes=False,
+ LogValues=values,
+ ParseType=False,
LogTypes=types)
- def test_validation_invalid_types(self):
+ def test_validation_invalid_types(self):
"""
Test validation for differing numbers of log names and log types.
"""
@@ -240,8 +240,8 @@ class AddSampleLogMultipleTest(unittest.TestCase):
AddSampleLogMultiple,
Workspace=self._workspace,
LogNames=names,
- LogValues=values
- ParseTypes=False,
+ LogValues=values,
+ ParseType=False,
LogTypes=types)
--
GitLab