Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve tests traceability, add test for Systemd dependency cycles #3917

Merged
merged 1 commit into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

- name: Run tests
run: |
./tests/run_tests.sh
./tests/run_tests.sh --durations=0 --durations-min=5.0

- name: Archive logs
uses: actions/upload-artifact@v4
Expand Down
14 changes: 8 additions & 6 deletions tests/smoke_test/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


@pytest.mark.dependency()
@pytest.mark.timeout(600)
@pytest.mark.timeout(120)
def test_init(shell):
def check_container_running(container_name):
out = shell.run_check(
Expand All @@ -35,7 +35,6 @@ def check_container_running(container_name):
_LOGGER.info("%s", "\n".join(output))


@pytest.mark.dependency(depends=["test_init"])
def test_rauc_status(shell, shell_json):
rauc_status = shell.run_check("rauc status --output-format=shell --detailed")
# RAUC_BOOT_PRIMARY won't be set if correct grub env is missing
Expand All @@ -55,7 +54,6 @@ def test_rauc_status(shell, shell_json):
assert f"RAUC_SLOT_STATUS_BUNDLE_VERSION_{booted_idx + 1}='{expected_version}'" in rauc_status


@pytest.mark.dependency(depends=["test_init"])
def test_dmesg(shell):
output = shell.run_check("dmesg")
_LOGGER.info("%s", "\n".join(output))
Expand All @@ -67,17 +65,22 @@ def test_supervisor_logs(shell):
_LOGGER.info("%s", "\n".join(output))


@pytest.mark.dependency(depends=["test_init"])
def test_systemctl_status(shell):
output = shell.run_check("systemctl --no-pager -l status -a || true")
_LOGGER.info("%s", "\n".join(output))

@pytest.mark.dependency(depends=["test_init"])

def test_systemctl_check_no_failed(shell):
output = shell.run_check("systemctl --no-pager -l list-units --state=failed")
assert "0 loaded units listed." in output, f"Some units failed:\n{"\n".join(output)}"


def test_systemctl_no_cycles(shell):
# we don't have systemd-analyze available, so check it naively using grep
output = shell.run_check("journalctl -b0 | grep 'ordering cycle' || true")
assert not output, f"Found Systemd dependency cycles:\n{"\n".join(output)}"


@pytest.mark.dependency(depends=["test_init"])
def test_custom_swap_size(shell, target):
output = shell.run_check("stat -c '%s' /mnt/data/swapfile")
Expand All @@ -103,7 +106,6 @@ def test_no_swap(shell, target):
assert swapon == [], f"Swapfile still exists: {swapon}"


@pytest.mark.dependency(depends=["test_init"])
def test_kernel_not_tainted(shell):
"""Check if the kernel is not tainted - do it at the end of the
test suite to increase the chance of catching issues."""
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke_test/test_offline.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def _check_connectivity(shell, *, connected):
raise AssertionError(f"expecting connected but all targets are down")


@pytest.mark.timeout(300) # takes quite a while also because of 90s NTP sync timeout
@pytest.mark.timeout(120)
@pytest.mark.usefixtures("without_internet")
def test_ha_runs_offline(shell):
def check_container_running(container_name):
Expand Down
6 changes: 3 additions & 3 deletions tests/supervisor_test/test_supervisor.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def stash() -> dict:


@pytest.mark.dependency()
@pytest.mark.timeout(600)
@pytest.mark.timeout(120)
def test_start_supervisor(shell, shell_json):
def check_container_running(container_name):
out = shell.run_check(f"docker container inspect -f '{{{{.State.Status}}}}' {container_name} || true")
Expand Down Expand Up @@ -55,7 +55,7 @@ def test_check_supervisor(shell_json):


@pytest.mark.dependency(depends=["test_check_supervisor"])
@pytest.mark.timeout(300)
@pytest.mark.timeout(120)
def test_update_supervisor(shell_json):
supervisor_info = shell_json("ha supervisor info --no-progress --raw-json")
supervisor_version = supervisor_info.get("data").get("version")
Expand Down Expand Up @@ -153,7 +153,7 @@ def test_addon_uninstall(shell_json):


@pytest.mark.dependency(depends=["test_supervisor_is_updated"])
@pytest.mark.timeout(450)
@pytest.mark.timeout(120)
def test_restart_supervisor(shell, shell_json):
result = shell_json("ha supervisor restart --no-progress --raw-json")
assert result.get("result") == "ok", f"Supervisor restart failed: {result}"
Expand Down