From 7a16fc8ff8a5ce2e70138fad94331dcf4fc5a65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Fri, 13 Jul 2018 14:05:41 +0000
Subject: [PATCH] Task LSMR-14: Fixed functional tests
---
SAS/LSMR/test/t_functional.py | 55 +++++++++++++++-------------------
SAS/LSMR/test/t_functional.run | 2 +-
2 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/SAS/LSMR/test/t_functional.py b/SAS/LSMR/test/t_functional.py
index d52067699f8..8e50404768b 100755
--- a/SAS/LSMR/test/t_functional.py
+++ b/SAS/LSMR/test/t_functional.py
@@ -411,26 +411,30 @@ class WorkRelationSelectionTemplateTestCase(unittest.TestCase):
class WorkIORoleTestCase(unittest.TestCase):
- # test data
- test_data_1 = {"role": BASE_URL + '/role_choice/correlator/',
- "datatype": BASE_URL + '/datatype_choice/image/',
- "dataformat": BASE_URL + '/dataformat_choice/HDF5/',
- "outputs": None,
- "inputs": None,
- "tags": []
- }
-
- test_data_2 = {"role": BASE_URL + '/role_choice/target/',
- "datatype": BASE_URL + '/datatype_choice/visibilities/',
- "dataformat": BASE_URL + '/dataformat_choice/MeasurementSet/',
- "outputs": None,
- "inputs": None,
- "tags": []
- }
-
- test_patch = {"role": BASE_URL + '/role_choice/calibrator/',
- "dataformat": BASE_URL + '/dataformat_choice/MeasurementSet/'
- }
+ def setUp(self):
+
+ # related items
+ url = POST_and_assert_expected_response(self, BASE_URL + '/work_request_template/',
+ WorkRequestTemplateTestCase.test_data_1, 201,
+ WorkRequestTemplateTestCase.test_data_1)['url']
+
+ # test data
+ self.test_data_1 = {"role": BASE_URL + '/role_choice/correlator/',
+ "datatype": BASE_URL + '/datatype_choice/image/',
+ "dataformat": BASE_URL + '/dataformat_choice/HDF5/',
+ "outputs": url,
+ "inputs": url,
+ "tags": []}
+
+ self.test_data_2 = {"role": BASE_URL + '/role_choice/target/',
+ "datatype": BASE_URL + '/datatype_choice/visibilities/',
+ "dataformat": BASE_URL + '/dataformat_choice/MeasurementSet/',
+ "outputs": url,
+ "inputs": url,
+ "tags": []}
+
+ self.test_patch = {"role": BASE_URL + '/role_choice/calibrator/',
+ "dataformat": BASE_URL + '/dataformat_choice/MeasurementSet/'}
def test_work_io_role_list_apiformat(self):
r = requests.get(BASE_URL + '/work_io_role/?format=api')
@@ -478,17 +482,6 @@ class WorkIORoleTestCase(unittest.TestCase):
r_dict = POST_and_assert_expected_response(self, BASE_URL + '/work_io_role/', test_data_invalid, 400, {})
self.assertTrue('Invalid hyperlink' in str(r_dict['inputs']))
- def test_work_io_role_POST_existing_inputs_works(self):
-
- # First POST a new item to reference
- r_dict = POST_and_assert_expected_response(self, BASE_URL + '/work_request_template/', WorkRequestTemplateTestCase.test_data_1, 201, WorkRequestTemplateTestCase.test_data_1,)
- url = r_dict['url']
-
- # POST a new item with correct reference
- test_data_valid = dict(self.test_data_1)
- test_data_valid['inputs'] = url
- POST_and_assert_expected_response(self, BASE_URL + '/work_io_role/', test_data_valid, 201, test_data_valid)
-
def test_work_io_role_POST_nonexistant_outputs_raises_error(self):
# POST a new item with wrong reference
diff --git a/SAS/LSMR/test/t_functional.run b/SAS/LSMR/test/t_functional.run
index 4d270d2d841..0a7f51a387f 100755
--- a/SAS/LSMR/test/t_functional.run
+++ b/SAS/LSMR/test/t_functional.run
@@ -10,7 +10,7 @@ PORT=8777
lsmr -p $PORT &
DJANGO_PID=$!
echo "Started Django server with PID: " $DJANGO_PID
-sleep 3
+sleep 15
# Run test
./t_functional.py
--
GitLab