Fix final regression suite problems

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Dec 7, 2023 · 749673f · 749673f
1 parent ca1e6d0
commit 749673f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/testing/regress/ecl/globalid.ecl b/testing/regress/ecl/globalid.ecl
@@ -21,6 +21,9 @@ import lib_workunitservices;
 #option('CallerId', 'PkAntaCLkY4MknCnXA');
 #option('GlobalId', 'xPSDvT9akc1fGSTZWJKb');
 
-OUTPUT(logging.getGlobalId(), NAMED('GlobalId'));
-OUTPUT(logging.getCallerId(), NAMED('CallerId'));
+//The global and caller ids could either be set by esp when the query is received
+//or from the #options above, so the test checks that it has been set by someone.
+
+OUTPUT(logging.getGlobalId() != '', NAMED('GlobalId'));
+OUTPUT(logging.getCallerId() != '', NAMED('CallerId'));
 
diff --git a/testing/regress/ecl/key/globalid.xml b/testing/regress/ecl/key/globalid.xml
@@ -1,6 +1,6 @@
 <Dataset name='GlobalId'>
- <Row><GlobalId>xPSDvT9akc1fGSTZWJKb</GlobalId></Row>
+ <Row><GlobalId>true</GlobalId></Row>
 </Dataset>
 <Dataset name='CallerId'>
- <Row><CallerId>PkAntaCLkY4MknCnXA</CallerId></Row>
+ <Row><CallerId>true</CallerId></Row>
 </Dataset>
diff --git a/testing/regress/ecl/key/soapcall_multihttpheader.xml b/testing/regress/ecl/key/soapcall_multihttpheader.xml
@@ -1,5 +1,5 @@
 <Dataset name='soapcallResult'>
- <Row><Method>POST</Method><UrlPath>/WsSmc/HttpEcho</UrlPath><UrlParameters>name=doe,joe&amp;number=1</UrlParameters><Headers><Header>Accept-Encoding: gzip, deflate</Header><Header>StoredHeader: StoredHeaderDefault</Header><Header>constHeader: constHeaderValue</Header><Header>literalHeader: literalHeaderValue</Header><Header>traceparent: 00-0123456789abcdef0123456789abcdef-0123456789abcdef-01</Header></Headers><Content>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;soap:Envelope xmlns:soap=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot;&gt;
+ <Row><Method>POST</Method><UrlPath>/WsSmc/HttpEcho</UrlPath><UrlParameters>name=doe,joe&amp;number=1</UrlParameters><Headers><Header>Accept-Encoding: gzip, deflate</Header><Header>HPCC-Caller-Id: http111</Header><Header>HPCC-Global-Id: 9876543210</Header><Header>StoredHeader: StoredHeaderDefault</Header><Header>constHeader: constHeaderValue</Header><Header>literalHeader: literalHeaderValue</Header><Header>traceparent: 00-0123456789abcdef0123456789abcdef-0123456789abcdef-01</Header></Headers><Content>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;soap:Envelope xmlns:soap=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot;&gt;
  &lt;soap:Body&gt;
   &lt;HttpEcho&gt;
    &lt;Name&gt;Doe, Joe&lt;/Name&gt;
@@ -10,7 +10,7 @@
 &lt;/soap:Envelope&gt;</Content></Row>
 </Dataset>
 <Dataset name='proxyResult'>
- <Row><Method>POST</Method><UrlPath>/WsSmc/HttpEcho</UrlPath><UrlParameters>name=doe,joe&amp;number=1</UrlParameters><Headers><Header>Accept-Encoding: gzip, deflate</Header><Header>StoredHeader: StoredHeaderDefault</Header><Header>constHeader: constHeaderValue</Header><Header>literalHeader: literalHeaderValue</Header><Header>traceparent: 00-0123456789abcdef0123456789abcdef-f123456789abcdef-01</Header></Headers><Content>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;soap:Envelope xmlns:soap=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot;&gt;
+ <Row><Method>POST</Method><UrlPath>/WsSmc/HttpEcho</UrlPath><UrlParameters>name=doe,joe&amp;number=1</UrlParameters><Headers><Header>Accept-Encoding: gzip, deflate</Header><Header>HPCC-Caller-Id: http111</Header><Header>HPCC-Global-Id: 9876543210</Header><Header>StoredHeader: StoredHeaderDefault</Header><Header>constHeader: constHeaderValue</Header><Header>literalHeader: literalHeaderValue</Header><Header>traceparent: 00-0123456789abcdef0123456789abcdef-f123456789abcdef-01</Header></Headers><Content>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;soap:Envelope xmlns:soap=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot;&gt;
  &lt;soap:Body&gt;
   &lt;HttpEcho&gt;
    &lt;Name&gt;Doe, Joe&lt;/Name&gt;

diff --git a/testing/regress/ecl/soapcall_multihttpheader.ecl b/testing/regress/ecl/soapcall_multihttpheader.ecl
@@ -41,6 +41,7 @@ string constHeader := 'constHeaderValue';
 
 soapcallResult := SOAPCALL(TargetURL, 'HttpEcho', httpEchoServiceRequestRecord, DATASET(httpEchoServiceResponseRecord), LITERAL, xpath('HttpEchoResponse'),
                 httpheader('StoredHeader', storedHeader), httpheader('literalHeader', 'literalHeaderValue'), httpheader('constHeader', constHeader),
+                httpheader('HPCC-Global-Id','9876543210'), httpheader('HPCC-Caller-Id','http111'),
                 httpheader('traceparent', '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01'));
 
 output(soapcallResult, named('soapcallResult'));
@@ -52,6 +53,7 @@ string TargetProxy := 'http://' + TargetIP + ':8010';
 
 proxyResult := SOAPCALL(HostURL, 'HttpEcho', httpEchoServiceRequestRecord, DATASET(httpEchoServiceResponseRecord), LITERAL, xpath('HttpEchoResponse'), proxyAddress(TargetProxy),
                 httpheader('StoredHeader', storedHeader), httpheader('literalHeader', 'literalHeaderValue'), httpheader('constHeader', constHeader),
+                httpheader('HPCC-Global-Id','9876543210'), httpheader('HPCC-Caller-Id','http111'),
                 httpheader('traceparent', '00-0123456789abcdef0123456789abcdef-f123456789abcdef-01'));
 
 output(proxyResult, named('proxyResult'));