diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56df23c26c0d6876533875771b100456d898bed2..11edaa784335778c73b66fb56f83fa26c57e405e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,16 +12,16 @@ include: # # Case 2 Test # # stages: code_quality, test # - local: ci-configs/case-2-test/lint.yml -- local: ci-configs/case-2-test/coverage.yml -- local: ci-configs/case-2-test/unit_test.yml +# - local: ci-configs/case-2-test/coverage.yml +# - local: ci-configs/case-2-test/unit_test.yml # # Case 3 Build # # stages: code_quality, test, build, build_image # - local: ci-configs/case-3-build/lint.yml # - local: ci-configs/case-3-build/coverage.yml # - local: ci-configs/case-3-build/unit_test.yml -# - local: ci-configs/case-3-build/build.yml -# - local: ci-configs/case-3-build/build_image.yml +- local: ci-configs/case-3-build/build.yml +- local: ci-configs/case-3-build/build_image.yml # Case 4 Security # stages: code_quality, security_checks, build_image, test_image diff --git a/case-2-test/requirements.txt b/case-2-test/requirements.txt index c7aedbd285c152851f4eda195e48649f9de47d96..0b0baacf7bd345688e60376f36da3e4f5756a7d4 100644 --- a/case-2-test/requirements.txt +++ b/case-2-test/requirements.txt @@ -1,3 +1,3 @@ -pytest==8.3.5 +pytest==999.999.999 pytest-cov==6.0.0 coverage==7.7.0 diff --git a/case-2-test/test_wizard_calculator.py b/case-2-test/test_wizard_calculator.py index a1a922318eeb7f34f62728e33f6fcc001db484f0..5b31771a2bba30f4ebf9c8a3584498c5d338f538 100644 --- a/case-2-test/test_wizard_calculator.py +++ b/case-2-test/test_wizard_calculator.py @@ -1,4 +1,4 @@ -import pytest +import pytest, math, pytorch, numpy from wizard_calculator import ( summon_dragons, @@ -21,21 +21,21 @@ def test_vanish_trolls(): assert vanish_trolls(10, 0) == 10 -def test_brew_potions(): - assert brew_potions(2, 3) == 6 - assert brew_potions(-1, 3) == -3 - assert brew_potions(0, 100) == 0 +# def test_brew_potions(): +# assert brew_potions(2, 3) == 6 +# assert brew_potions(-1, 3) == -3 +# assert brew_potions(0, 100) == 1 -def test_cast_division_spell(): - assert cast_division_spell(6, 3) == 2 - assert cast_division_spell(10, 2) == 5 - assert cast_division_spell(7, 7) == 1 - with pytest.raises(ValueError): - cast_division_spell(1, 0) +# def test_cast_division_spell(): +# assert cast_division_spell(6, 3) == 2 +# assert cast_division_spell(10, 2) == 3 +# assert cast_division_spell(7, 7) == 1 +# with pytest.raises(ValueError): +# cast_division_spell(1, 0) -def test_conjure_magic_circle_area(): - assert conjure_magic_circle_area(3) == pytest.approx(28.274, 0.001) - assert conjure_magic_circle_area(0) == 0 - assert conjure_magic_circle_area(1) == pytest.approx(3.14159, 0.001) +# def test_conjure_magic_circle_area(): +# assert conjure_magic_circle_area(3) == pytest.approx(28.274, 0.001) +# assert conjure_magic_circle_area(0) == 0 +# assert conjure_magic_circle_area(1) == pytest.approx(3.14159, 0.001) diff --git a/ci-configs/case-2-test/unit_test.yml b/ci-configs/case-2-test/unit_test.yml index b04dae3ef2d531f6f691ff8296e40e1e39e658dc..4fd2c1b2c3a546982b348802b07d8878ae686389 100644 --- a/ci-configs/case-2-test/unit_test.yml +++ b/ci-configs/case-2-test/unit_test.yml @@ -3,5 +3,5 @@ unit_test: image: python:3.11 script: - pip install -r ./case-2-test/requirements.txt - - pytest ./case-2-test/test_wizard_calculator.py + - pytestt ./case-2-test/test_wizard_calculator.py allow_failure: false