Task #10695: Moved data_sets dir to $taskname.in_datasets, allowing assay to...

Task #10695: Moved data_sets dir to $taskname.in_datasets, allowing assay to copy them to the test dir, instead of having to rely on $srcdir in the tests.

.gitattributes

@@ -4819,20 +4819,20 @@ SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt -text
 SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice -text
 SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice.ini -text
 SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_beam_observation -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_interferometer_observation -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_maintenance -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_preprocessing -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_pulsar_pipeline -text
-SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_reservation -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_beam_observation -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_interferometer_observation -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_maintenance -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_preprocessing -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_pulsar_pipeline -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_reservation -text
 SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.run -text
 SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.sh eol=lf
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt -text

SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py

@@ -63,9 +63,7 @@ class TestRASubset(unittest.TestCase):
     def setUp(self):
         _, filename = os.path.split(__file__)
         self.data_sets_filename_prefix, _ = os.path.splitext(filename)
-        self.data_sets_dir = os.path.join(
-            os.environ.get('srcdir', os.path.dirname(os.path.abspath(__file__))),
-            "data_sets")
+        self.data_sets_dir = "tRATaskSpecified.in_datasets"
 
     # ------------------------------------------------------------------------------------------------------------------
     # Actual tests, one for each type of input parset