Commit f9bd5b96 authored by Michele Carignani's avatar Michele Carignani

use robotframework-mocklibrary 0.0.7 and remove patch

parent 5d7b0b75
Pipeline #5464 passed with stage
in 0 seconds
diff --git a/src/MockServerLibrary/library.py b/src/MockServerLibrary/library.py
index a9e6227..7ba1eed 100644
--- a/src/MockServerLibrary/library.py
+++ b/src/MockServerLibrary/library.py
@@ -66,6 +66,9 @@ class MockServerLibrary(object):
match_type = 'STRICT' if exact else 'ONLY_MATCHING_FIELDS'
req['body'] = {'type': body_type, 'json': json.dumps(body), 'matchType': match_type}
+ if body_type is 'JSON_SCHEMA' and body:
+ req['body'] = {'type': body_type, 'json': json.dumps(body)}
+
return req
def create_mock_response(self, status_code, headers=None, body_type='JSON', body=None):
@@ -97,6 +100,42 @@ class MockServerLibrary(object):
return rsp
+ def create_mock_http_forward(self, path, delay=1, unit='SECONDS'):
+ """Creates a mock http override forward to be used by mockserver.
+
+ Returns the http forward in a dictionary format.
+
+ `path` is the new url where to forward the request
+
+ `delay` is the delay of the forward action
+
+ `unit` is the unit of the delay time (default "SECONDS")
+ """
+ fwd = {}
+ fwd['httpRequest'] = {'path': path}
+ fwd['delay'] = {'timeUnit': unit, 'value': delay}
+
+ return fwd
+
+ def create_mock_expectation_with_http_forward(self, request, forward, count=1, unlimited=True):
+ """Creates a mock expectation with request and forward action to be used by mockserver.
+
+ `request` is a mock request matcher in a dictionary format.
+
+ `forward` is a mock forward in a dictionary format.
+
+ `count` is the number of expected requests
+
+ `unlimited` is a boolean value which, if enabled, allows unspecified number of
+ requests to reply to
+ """
+ data = {}
+ data['httpRequest'] = request
+ data['httpOverrideForwardedRequest'] = forward
+ data['times'] = {'remainingTimes': int(count), 'unlimited': unlimited}
+
+ self.create_mock_expectation_with_data(data)
+
def create_mock_expectation(self, request, response, count=1, unlimited=True):
"""Creates a mock expectation to be used by mockserver.
......@@ -42,11 +42,7 @@ RUN pip3 install robotframework
RUN DEBIAN_FRONTEND=noninteractive \
&& cd /home/etsi/dev/robot \
&& pip3 install -r requirements.txt \
&& chmod +x /home/etsi/dev/robot/scripts/* \
&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver \
&& cd robotframework-mockserver \
&& patch -p1 < ../extensions/mockserverlibrary.patch \
&& python3 -m pip install -e .
&& chmod +x /home/etsi/dev/robot/scripts/*
CMD tail -f /dev/null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment