Skip to content

Commit

Permalink
Address feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Thien Trung Vuong <[email protected]>
  • Loading branch information
trungams committed Feb 4, 2025
1 parent 54da507 commit d6fc304
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
3 changes: 2 additions & 1 deletion lisa/tools/tpm2.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ def _install(self) -> bool:
return self._check_exists()

def pcrread(
self, alg: str = "sha256", pcrs: Optional[Union[int, Sequence[int]]] = None
self, pcrs: Optional[Union[int, Sequence[int]]] = None
) -> Dict[int, str]:
alg = "sha256"
pcrs = self._get_pcr_list(pcrs)
if len(pcrs) == 0:
pcrs_arg = "all"
Expand Down
22 changes: 4 additions & 18 deletions microsoft/testsuites/cvm/cvm_boot.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@

import itertools
from pathlib import Path
from typing import Any, List, cast
from typing import Any, cast

from assertpy.assertpy import assert_that, assert_warn

from lisa import (
Environment,
Logger,
Node,
RemoteNode,
Expand All @@ -23,7 +22,7 @@
)
from lisa.operating_system import CBLMariner, Posix
from lisa.sut_orchestrator import AZURE
from lisa.testsuite import TestResult, simple_requirement
from lisa.testsuite import simple_requirement
from lisa.tools import BootCtl, Lsblk, Reboot, Tpm2
from lisa.tools.lsblk import PartitionInfo
from lisa.util import (
Expand Down Expand Up @@ -62,14 +61,7 @@ def before_case(self, log: Logger, **kwargs: Any) -> None:
supported_platform_type=[AZURE],
),
)
def verify_encrypted_root_partition(
self,
log: Logger,
node: RemoteNode,
environment: Environment,
log_path: Path,
result: TestResult,
) -> None:
def verify_encrypted_root_partition(self, node: RemoteNode) -> None:
security_profile_settings = cast(
SecurityProfileSettings, node.features[SecurityProfile].get_settings()
)
Expand Down Expand Up @@ -107,13 +99,7 @@ def verify_encrypted_root_partition(
),
)
def verify_boot_success_after_component_upgrade(
self,
log: Logger,
node: RemoteNode,
environment: Environment,
log_path: Path,
result: TestResult,
**kwargs: Any,
self, log: Logger, node: RemoteNode, log_path: Path
) -> None:
posix_os: Posix = cast(Posix, node.os)
# First boot
Expand Down

0 comments on commit d6fc304

Please sign in to comment.