#1603 Stop upgrading the Flask packages in the CentOS Python 2 tests container image
Merged 4 years ago by mprahl. Opened 4 years ago by mprahl.

file modified
+1 -2
@@ -19,7 +19,6 @@ 

      git \

      kobo \

      kobo-rpmlib \

-     libmodulemd1 \

      python-backports-ssl_match_hostname \

      python-dnf \

      python-dogpile-cache \
@@ -52,7 +51,7 @@ 

      && yum clean all

  # We currently require newer versions of these Python packages for the tests.

  # more-itertools is required by pytest, but versions 6.0.0 and up aren't Python 2 compatible

- RUN pip install --upgrade flask-sqlalchemy "pytest<5.0" flake8 tox pip "more-itertools<6.0.0" pytest-cov

+ RUN pip install --upgrade "pytest<5.0" flake8 tox pip "more-itertools<6.0.0" pytest-cov

  # Install zipp as a workaround for https://github.com/pypa/virtualenv/issues/1630

  RUN pip install zipp

  VOLUME /src

file modified
+3 -3
@@ -1269,7 +1269,7 @@ 

              "/module-build-service/1/module-builds/7", data=json.dumps({"state": "failed"}))

  

          assert rv.status_code == 400

-         assert rv.json == {

+         assert json.loads(rv.data) == {

              "error": "Bad Request",

              "message": (

                  "To cancel a module build, it must be in one of the following states: "
@@ -1342,7 +1342,7 @@ 

              "/module-build-service/1/module-builds/7", data=json.dumps({"state": "some_state"}))

  

          assert rv.status_code == 400

-         assert rv.json == {

+         assert json.loads(rv.data) == {

              "error": "Bad Request",

              "message": "An invalid state was submitted. Valid states values are: failed, 4",

              "status": 400,
@@ -2775,7 +2775,7 @@ 

          payload = {"branch": "master", "scmurl": scm_url}

          if br_override:

              payload["buildrequire_overrides"] = br_override

-         rv = self.client.post(post_url, json=payload)

+         rv = self.client.post(post_url, data=json.dumps(payload))

          data = json.loads(rv.data)

  

          mmd = load_mmd(data[0]["modulemd"])

This will ensure that the code works with the version of Flask in RHEL 7.

rebased onto dc36ac1

4 years ago

@mikem @breilly @cqi could you please review?

I will rebuild the testing container image after this is merged.

pretty please pagure-ci rebuild

4 years ago

Pull-Request has been merged by mprahl

4 years ago