From b1734c1104458d8a772e3b91f14f5fcba1faf07a Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Thu, 20 Apr 2017 14:25:26 +0000 Subject: [PATCH] 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 | 28 +++++++++---------- .../tRATaskSpecified.in_beam_observation | 0 .../tRATaskSpecified.in_calibration_pipeline | 0 ...in_calibration_pipeline_predecessor_558022 | 0 ...askSpecified.in_interferometer_observation | 0 ...tRATaskSpecified.in_long_baseline_pipeline | 0 ..._long_baseline_pipeline_predecessor_556601 | 0 ...aseline_pipeline_predecessor_556601_556429 | 0 ..._pipeline_predecessor_556601_556429_556373 | 0 ..._pipeline_predecessor_556601_556429_556375 | 0 ...ne_predecessor_556601_556429_xxxxxx_556371 | 0 .../tRATaskSpecified.in_maintenance | 0 .../tRATaskSpecified.in_preprocessing | 0 .../tRATaskSpecified.in_pulsar_pipeline | 0 .../tRATaskSpecified.in_reservation | 0 .../test/tRATaskSpecified.py | 4 +-- 16 files changed, 15 insertions(+), 17 deletions(-) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_beam_observation (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_calibration_pipeline (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_interferometer_observation (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_maintenance (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_preprocessing (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_pulsar_pipeline (100%) rename SAS/ResourceAssignment/RATaskSpecifiedService/test/{data_sets => tRATaskSpecified.in_datasets}/tRATaskSpecified.in_reservation (100%) diff --git a/.gitattributes b/.gitattributes index d65b1b767ff..f5bb170117a 100644 --- a/.gitattributes +++ b/.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 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_beam_observation b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_beam_observation similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_beam_observation rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_beam_observation diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_calibration_pipeline_predecessor_558022 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_interferometer_observation b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_interferometer_observation similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_interferometer_observation rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_interferometer_observation diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556373 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_556375 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_long_baseline_pipeline_predecessor_556601_556429_xxxxxx_556371 diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_maintenance b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_maintenance similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_maintenance rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_maintenance diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_preprocessing b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_preprocessing similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_preprocessing rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_preprocessing diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_pulsar_pipeline b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_pulsar_pipeline similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_pulsar_pipeline rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_pulsar_pipeline diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_reservation b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_reservation similarity index 100% rename from SAS/ResourceAssignment/RATaskSpecifiedService/test/data_sets/tRATaskSpecified.in_reservation rename to SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_datasets/tRATaskSpecified.in_reservation diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py index cc51e5a29a4..168eb57ad3f 100644 --- a/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py +++ b/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 -- GitLab