use robotframework-mocklibrary 0.0.7 and remove patch (f9bd5b96) · Commits · MEC - Multi-access Edge Computing / MEC Robot Test Suite

extensions/mockserverlibrary.patch

deleted100644 → 0

+0 −59

Original line number	Original line	Diff line number	Diff line
	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.

requirements.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,3 +8,4 @@ robotframework-dependencylibrary==1.0.0.post1
	robotframework-jsonlibrary==0.3		robotframework-jsonlibrary==0.3
	robotframework-jsonschemalibrary==1.0		robotframework-jsonschemalibrary==1.0
	robotframework-requests==0.5.0		robotframework-requests==0.5.0
			robotframework-mockserver>=0.0.7

scripts/docker/Dockerfile

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -42,11 +42,7 @@ RUN pip3 install robotframework
	RUN DEBIAN_FRONTEND=noninteractive \		RUN DEBIAN_FRONTEND=noninteractive \
	&& cd /home/etsi/dev/robot \		&& cd /home/etsi/dev/robot \
	&& pip3 install -r requirements.txt \		&& pip3 install -r requirements.txt \
	&& chmod +x /home/etsi/dev/robot/scripts/* \		&& 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 .

	CMD tail -f /dev/null		CMD tail -f /dev/null

Admin message