Merge pull request #17800 from AttilaVamos/HPCC-26539-fix-9.4.x

HPCC-26539 Problems with httpcall_* and soapcall_* test cases in cloud (Azure) environment. Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 22, 2023 · a2673a7 · a2673a7
2 parents 2ea1897 + 7928e0f
commit a2673a7
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 "<roxie_echo format=\'raw\'><peeps id=\'id\' format=\'raw\'></peeps></roxie_echo>"'
 , PersonRec);

diff --git 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
@@ -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
@@ -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');