From 7928e0fa998c9fa6c186fedcdf6d421abef7f66c Mon Sep 17 00:00:00 2001 From: AttilaVamos Date: Thu, 21 Sep 2023 15:43:38 +0200 Subject: [PATCH] HPCC-26539 Problems with httpcall_* and soapcall_* test cases in cloud (Azure) environment. Delete one-line '//version ...' lines because they contains targetIP=x.x.x.x values and it prevents regression test engine to pass the proper, configured one. Delete '//class=spray' tag from: - httpcall_jsonpost.ecl - httpcall_xmlpost.ecl Add missing 'stored('targetIP)' into some tests to enable the RTE pass the correct value. Add correct 'targetIP' values into ecl-test-azure.json. Add missing copyright header where missing. Tested manually in AKS. Signed-off-by: AttilaVamos --- testing/regress/ecl-test-azure.json | 12 ++++++---- testing/regress/ecl/httpcall_jsonpost.ecl | 2 -- testing/regress/ecl/httpcall_xmlpost.ecl | 2 -- testing/regress/ecl/roxiegzip.ecl | 23 ++++++++++++++++--- testing/regress/ecl/roxiepipe.ecl | 21 ++++++++++++++++- testing/regress/ecl/roxiewhitespace.ecl | 23 ++++++++++++++++--- testing/regress/ecl/soapcall.ecl | 1 - .../regress/ecl/soapcall_multihttpheader.ecl | 17 ++++++++++++++ 8 files changed, 85 insertions(+), 16 deletions(-) diff --git a/testing/regress/ecl-test-azure.json b/testing/regress/ecl-test-azure.json index 5877e8a355c..487d500e492 100644 --- a/testing/regress/ecl-test-azure.json +++ b/testing/regress/ecl-test-azure.json @@ -50,10 +50,14 @@ ], "Params":[ "PassTest.ecl:bla='A value'", - "httpcall_multiheader.ecl:TargetIP=40.88.243.151", - "httpcall_jsonpost.ecl:targetIP=52.226.177.210", - "httpcall_xmlpost.ecl:targetIP=52.226.177.210", - "soapcall_multihttpheader.ecl:TargetIP=40.88.243.151" + "httpcall_multiheader.ecl:TargetIP=eclwatch", + "httpcall_jsonpost.ecl:targetIP=roxie", + "httpcall_xmlpost.ecl:targetIP=roxie", + "soapcall_multihttpheader.ecl:TargetIP=eclwatch", + "soapcall.ecl:targetIP=roxie", + "roxiegzip.ecl:TargetIP=roxie", + "roxiewhitespace.ecl:TargetIP=roxie", + "roxiepipe.ecl:TargetIP=roxie" ], "engineParams":[ "failOnLeaks", diff --git a/testing/regress/ecl/httpcall_jsonpost.ecl b/testing/regress/ecl/httpcall_jsonpost.ecl index 7a3c08e4399..5af5591ef07 100644 --- a/testing/regress/ecl/httpcall_jsonpost.ecl +++ b/testing/regress/ecl/httpcall_jsonpost.ecl @@ -15,12 +15,10 @@ limitations under the License. ############################################################################## */ -//class=spray //nothor //nohthor //class=roxieserviceaccess -//version targetIP='127.0.0.1',goodPort='9876',blacListedPort='9875' #option('generateGlobalId', true); diff --git a/testing/regress/ecl/httpcall_xmlpost.ecl b/testing/regress/ecl/httpcall_xmlpost.ecl index 73ae15866d9..74b08ed969f 100644 --- a/testing/regress/ecl/httpcall_xmlpost.ecl +++ b/testing/regress/ecl/httpcall_xmlpost.ecl @@ -15,12 +15,10 @@ limitations under the License. ############################################################################## */ -//class=spray //nothor //nohthor //class=roxieserviceaccess -//version targetIP='127.0.0.1',goodPort='9876',blacListedPort='9875' #option('generateGlobalId', true); diff --git a/testing/regress/ecl/roxiegzip.ecl b/testing/regress/ecl/roxiegzip.ecl index 0c7f3406da0..2ae23f5e543 100644 --- a/testing/regress/ecl/roxiegzip.ecl +++ b/testing/regress/ecl/roxiegzip.ecl @@ -1,6 +1,26 @@ +/*############################################################################## + + HPCC SYSTEMS software Copyright (C) 2023 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +############################################################################## */ + //nothor //nohthor +string TargetIP := '.' : stored('TargetIP'); +string TargetURL := 'http://' + TargetIP + ':9876'; + NameRec := RECORD string First; string Last; @@ -72,9 +92,6 @@ roxieEchoTestResponseRecord doFail() := TRANSFORM self.Exception.Source := 'Test'; END; -string TargetIP := '.' : stored('TargetIP'); -string TargetURL := 'http://' + TargetIP + ':9876'; - gzipResult := SOAPCALL(TargetURL, 'roxie_echo', roxieEchoTestRequestRecord, DATASET(roxieEchoTestResponseRecord), LITERAL, diff --git a/testing/regress/ecl/roxiepipe.ecl b/testing/regress/ecl/roxiepipe.ecl index 73762b90985..e9f39b9c49a 100644 --- a/testing/regress/ecl/roxiepipe.ecl +++ b/testing/regress/ecl/roxiepipe.ecl @@ -1,6 +1,25 @@ +/*############################################################################## + + HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +############################################################################## */ + //nothor //nohthor +string TargetIP := '.' : stored('TargetIP'); + NameRec := RECORD string10 First; string15 Last; @@ -49,7 +68,7 @@ pipe_recv := PIPE(pipe_send, ' -ow ' + SIZEOF(PersonRec) + ' -b 3' + ' -mr 2' + - ' -h .:9876 ' + + ' -h ' + TargetIP + ':9876 ' + ' -r Peeps' + ' -q ""' , PersonRec); diff --git a/testing/regress/ecl/roxiewhitespace.ecl b/testing/regress/ecl/roxiewhitespace.ecl index 64edfe8a51e..df007a4ca67 100644 --- a/testing/regress/ecl/roxiewhitespace.ecl +++ b/testing/regress/ecl/roxiewhitespace.ecl @@ -1,6 +1,26 @@ +/*############################################################################## + + HPCC SYSTEMS software Copyright (C) 2023 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +############################################################################## */ + //nothor //nohthor +string TargetIP := '.' : stored('TargetIP'); +string TargetURL := 'http://' + TargetIP + ':9876'; + NameRec := RECORD string First; string Last; @@ -46,9 +66,6 @@ roxieEchoTestResponseRecord doFail() := TRANSFORM self.Exception.Source := 'Test'; END; -string TargetIP := '.' : stored('TargetIP'); -string TargetURL := 'http://' + TargetIP + ':9876'; - soapcallResult := SOAPCALL(TargetURL, 'roxie_keepwhitespace', roxieEchoTestRequestRecord, DATASET(roxieEchoTestResponseRecord), LITERAL, diff --git a/testing/regress/ecl/soapcall.ecl b/testing/regress/ecl/soapcall.ecl index b42187fe8d8..9b1e9c195cb 100644 --- a/testing/regress/ecl/soapcall.ecl +++ b/testing/regress/ecl/soapcall.ecl @@ -16,7 +16,6 @@ ############################################################################## */ //class=roxieserviceaccess -//version targetIP='127.0.0.1',goodPort='9876',blacListedPort='9875' #option('generateGlobalId', true); diff --git a/testing/regress/ecl/soapcall_multihttpheader.ecl b/testing/regress/ecl/soapcall_multihttpheader.ecl index dff26e1359b..db81cab2d34 100644 --- a/testing/regress/ecl/soapcall_multihttpheader.ecl +++ b/testing/regress/ecl/soapcall_multihttpheader.ecl @@ -1,3 +1,20 @@ +/*############################################################################## + + HPCC SYSTEMS software Copyright (C) 2023 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +############################################################################## */ + string TargetIP := '.' : stored('TargetIP'); string storedHeader := 'StoredHeaderDefault' : stored('storedHeader');