From b8f9b97d514480e19093bca5a6b404a7abc250fc Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Mar 15 2022 04:59:23 +0000 Subject: Satisfy linters (flake8 and hadolint) --- diff --git a/Dockerfile b/Dockerfile index 3255366..7545f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ LABEL \ license="GPLv2+" \ build-date="" -WORKDIR /src RUN dnf -y install \ git-core \ python3-dateutil \ @@ -25,20 +24,22 @@ RUN dnf -y install \ RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt COPY . /tmp/code +WORKDIR /tmp/code RUN set -ex \ - && cd /tmp/code \ && version=$(./get-version.sh) \ && test -n "$version" \ && sed --regexp-extended -i -e \ "/^__version__ = /c\\__version__ = '$version'" greenwave/__init__.py \ - && pip3 install . --no-deps \ - && mkdir /src/docker \ + && pip3 install . --no-cache-dir --no-deps \ + && mkdir -p /src/docker \ && cp -v docker/docker-entrypoint.sh /src/docker \ && cp -vr conf /src \ && rm -rf /tmp/* \ # Quick test for the installed package and version && python3 -c "import greenwave; assert(greenwave.__version__ == '$version')" +WORKDIR /src + USER 1001 EXPOSE 8080 ENTRYPOINT ["/src/docker/docker-entrypoint.sh"] diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py index 4d0ccf5..a30de3c 100644 --- a/functional-tests/test_api_v1.py +++ b/functional-tests/test_api_v1.py @@ -1638,10 +1638,11 @@ def test_installed_subject_types(requests_session, greenwave_server): 'redhat-module', ] + def test_make_a_decision_on_passed_result_with_custom_scenario( requests_session, greenwave_server, testdatabuilder): item1_nvr = testdatabuilder.unique_nvr() - result1 = testdatabuilder.create_result( + testdatabuilder.create_result( item=item1_nvr, testcase_name='test.testcase1', outcome='FAILED'