Skip to content

Commit 81238c3

Browse files
authored
Fix-tests (#2050)
* Update for new FP issue details * Remove unneeded test * adjust tests * Remove GenAI sif tests not working for now * Fixes #2031
1 parent 7bff6e8 commit 81238c3

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

conf/build.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2121

2222
build_docs=0
2323
build_docker=0
24+
offline=0
2425

2526
. "${CONF_DIR}/env.sh"
2627

@@ -32,6 +33,9 @@ while [[ $# -ne 0 ]]; do
3233
docker)
3334
build_docker=1
3435
;;
36+
offline)
37+
offline=1
38+
;;
3539
*)
3640
;;
3741
esac
@@ -41,9 +45,18 @@ done
4145
echo "======= FORMATTING CODE ========="
4246
ruff format
4347
echo "======= BUILDING PACKAGE ========="
44-
rm -rf "${ROOT_DIR}/build/lib/sonar" "${ROOT_DIR}/build/lib/cli" "${ROOT_DIR}"/build/scripts*/sonar-tools "${ROOT_DIR}"/dist/sonar_tools*
45-
# python -m build
46-
poetry build
48+
if [[ "${offline}" = "1" ]]; then
49+
cp "${ROOT_DIR}/conf/offline/setup.py" "${ROOT_DIR}/"
50+
cp "${ROOT_DIR}/conf/offline/sonar-tools" "${ROOT_DIR}/"
51+
mv "${ROOT_DIR}/pyproject.toml" "${ROOT_DIR}/pyproject.toml.bak"
52+
python setup.py bdist_wheel
53+
mv "${ROOT_DIR}/pyproject.toml.bak" "${ROOT_DIR}/pyproject.toml"
54+
rm "${ROOT_DIR}/setup.py" "${ROOT_DIR}/sonar-tools" "${ROOT_DIR}/sonar_tools.egg-info"
55+
# python -m build
56+
else
57+
rm -rf "${ROOT_DIR}/build/lib/sonar" "${ROOT_DIR}/build/lib/cli" "${ROOT_DIR}"/build/scripts*/sonar-tools "${ROOT_DIR}"/dist/sonar_tools*
58+
poetry build
59+
fi
4760

4861
if [[ "${build_docs}" = "1" ]]; then
4962
echo "======= BUILDING DOCS ========="

test/unit/credentials-latest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
TARGET_TOKEN = getenv("SONAR_TOKEN_LATEST_ADMIN_USER")
2727

2828
ISSUE_FP = "64e848c0-d5f4-402e-8c80-af6536041b5e"
29-
ISSUE_FP_NBR_CHANGELOGS = 13
30-
ISSUE_FP_CHANGELOG_DATE = datetime(2025, 10, 23)
29+
ISSUE_FP_NBR_CHANGELOGS = 15
30+
ISSUE_FP_CHANGELOG_DATE = datetime(2025, 11, 2)
3131

3232
ISSUE_ACCEPTED = "e9eb08fe-bb53-443a-8a92-425589807c78"

test/unit/credentials.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
TARGET_TOKEN = getenv("SONAR_TOKEN_LATEST_ADMIN_USER")
2727

2828
ISSUE_FP = "64e848c0-d5f4-402e-8c80-af6536041b5e"
29-
ISSUE_FP_NBR_CHANGELOGS = 13
30-
ISSUE_FP_CHANGELOG_DATE = datetime(2025, 10, 23)
29+
ISSUE_FP_NBR_CHANGELOGS = 15
30+
ISSUE_FP_CHANGELOG_DATE = datetime(2025, 11, 2)
3131

3232
ISSUE_ACCEPTED = "e9eb08fe-bb53-443a-8a92-425589807c78"

test/unit/test_projects.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ def test_import_no_zip(get_test_project: Generator[projects.Project]) -> None:
139139
pytest.skip("No zip import in Community Build")
140140
assert get_test_project.import_zip(asynchronous=False) == "FAILED/ZIP_MISSING"
141141
get_test_project.key = "non-existing"
142-
res = get_test_project.import_zip(asynchronous=False)
143-
assert res.startswith("FAILED/ZIP_MISSING")
142+
with pytest.raises(exceptions.ObjectNotFound):
143+
get_test_project.import_zip(asynchronous=False)
144144

145145

146146
def test_monorepo() -> None:
@@ -365,19 +365,6 @@ def test_audit_languages(get_test_project: Generator[projects.Project]) -> None:
365365
assert proj.audit_languages({"audit.projects.utilityLocs": True}) == []
366366

367367

368-
def test_wrong_key_2(get_test_project: Generator[projects.Project]) -> None:
369-
"""test_wrong_key"""
370-
proj = get_test_project
371-
proj.key = tutil.NON_EXISTING_KEY
372-
with pytest.raises(exceptions.ObjectNotFound):
373-
_ = proj.webhooks()
374-
with pytest.raises(exceptions.ObjectNotFound):
375-
_ = proj.links()
376-
# assert proj.quality_gate() is None
377-
with pytest.raises(exceptions.ObjectNotFound):
378-
proj.audit({})
379-
380-
381368
def test_set_permissions(get_test_project: Generator[projects.Project]) -> None:
382369
"""test_set_permissions"""
383370
proj = get_test_project
@@ -405,6 +392,7 @@ def test_import_zips() -> None:
405392
res = projects.import_zips(tutil.SQ, project_list=proj_list)
406393
assert len(res) == len(proj_list)
407394
assert sum(1 for r in res.values() if r["importStatus"] != "SUCCESS") == len(proj_list)
395+
projects.Project.get_object(tutil.SQ, "non-existing").delete()
408396

409397

410398
def test_export_zips() -> None:
File renamed without changes.

0 commit comments

Comments
 (0)