Install the vendored HttpCtrl, not PyPI's 0.3.3

requirements.txt pins robotframework-httpctrl==0.3.3 from PyPI, so the vendored copy in libraries/robotframework-httpctrl/ is never installed: the stub-matching fixes of !282 (merged), !284 (merged) and !311 (merged) (and the open !313 (merged)-!316 (merged)) never run, and the keyword Get Request Url Params, called by six distributed-operation test cases, does not exist in 0.3.3. Now -e ./libraries/robotframework-httpctrl/. The ITB image copies the vendored library next to requirements.txt and installs from /tmp (pip resolves the relative path against the working directory). Checked: a fresh venv and the Dockerfile's steps in a python container both install the vendored 0.3.1 with the keyword.

Merge request reports

Loading
+3 −1
Changes for itb/robot-processing/Dockerfile: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ RUN apt-get update && apt-get install -y \
    && rm -rf /var/lib/apt/lists/*

COPY requirements.txt /tmp/requirements.txt
COPY libraries/robotframework-httpctrl /tmp/libraries/robotframework-httpctrl

# From /tmp: requirements.txt names the vendored HttpCtrl by a path relative to the working directory
RUN python3 -m venv /opt/venv \
    && /opt/venv/bin/pip install -r /tmp/requirements.txt
    && cd /tmp && /opt/venv/bin/pip install -r /tmp/requirements.txt
        
RUN mkdir -p /opt/robot-tests/working-repo /opt/robot-tests/listeners && \
    chown -R 1000:1000 /opt/robot-tests
+1 −1
Changes for libraries/robotframework-httpctrl/PKG-INFO.rst: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Dependencies
Setup
============

Make sure to add the src/ directory to your PYTHONPATH. This allows Python and Robot Framework to correctly locate the HttpCtrl modules.
In the NGSI-LD Test Suite, this library is installed in editable mode by ``pip install -r requirements.txt`` (see the ``requirements.txt`` file at the repository root).


Brief Overview of the Library Content
+1 −1
Changes for libraries/robotframework-httpctrl/README.rst: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Dependencies
Setup
============

Make sure to add the src/ directory to your PYTHONPATH. This allows Python and Robot Framework to correctly locate the HttpCtrl modules.
In the NGSI-LD Test Suite, this library is installed in editable mode by ``pip install -r requirements.txt`` (see the ``requirements.txt`` file at the repository root).


Brief Overview of the Library Content
+4 −2
Changes for README.md: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ These scripts develop a set of operations, the same in the different Operating S
- Cloning the NGSI-LD Test Suite repository in the local folder and create the corresponding Python Virtual Environment
taking into account the content of `requirements.txt` file. Further details on each library can be found in 
[PyPi](https://pypi.org/) and 
[Robot Framework Standard Libraries](http://robotframework.org/robotframework/#standard-libraries).
[Robot Framework Standard Libraries](http://robotframework.org/robotframework/#standard-libraries), except for HttpCtrl, 
which is not installed from PyPI but from the vendored copy in
[`libraries/robotframework-httpctrl`](libraries/robotframework-httpctrl).


## Configure the Test Suite
@@ -208,7 +210,7 @@ the pre-commit formatting hook, Test Case authoring rules, documentation update
* [JSON Library](https://github.com/robotframework-thailand/robotframework-jsonlibrary)
* [Requests Library](https://github.com/MarketSquare/robotframework-requests)
* [Deep Diff](https://github.com/seperman/deepdiff)
* [HttpCtrl Library](https://github.com/annoviko/robotframework-httpctrl)
* [HttpCtrl Library](libraries/robotframework-httpctrl) (vendored copy with ETSI patches, forked from [upstream](https://github.com/annoviko/robotframework-httpctrl))
* [Robotidy Library ](https://github.com/MarketSquare/robotframework-tidy)


+4 −1
Changes for requirements.txt: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ robotframework-requests==0.9.7
deepdiff==8.6.1
prettydiff==0.1.0
paho-mqtt==1.6.1
robotframework-httpctrl==0.3.3
# The mock server is the vendored copy in libraries/robotframework-httpctrl/, not PyPI's 0.3.3:
# the stub matching the distributed-operation tests rely on (!282, !284, !311) and the keyword
# `Get Request Url Params` they call exist only there.
-e ./libraries/robotframework-httpctrl/
robotframework-robocop==7.2.0
robotframework-mqttlibrary==0.7.1.post3
Loading