Skip to content

[pull] main from google:main #46

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.

Sign up for GitHub

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

Merged
pull merged 1 commit into from
Nov 6, 2025
Merged

[pull] main from google:main #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions e2etests/cvdr/cvdr_create_with_branch_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ set -e -x
source ${TEST_SRCDIR}/_main/cvdr/common_utils.sh
validate_components

SERVICE=$(cvdr get_config user_default_service || cvdr get_config system_default_service)
SERVICE_URL=$(cvdr get_config "services[\"$SERVICE\"].service_url")

HOSTNAME=$(cvdr host create)
cleanup() {
cvdr host delete ${HOSTNAME}
Expand All @@ -19,13 +22,13 @@ cvdr create \
# TODO(b/448209030): cvdr list should print proper ADB connection status.
ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
EXPECTED_OUTPUT="Host: ${HOSTNAME}
WebUI: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/
WebUI: $SERVICE_URL/v1/zones/local/hosts/${HOSTNAME}/
Group: cvd
Instance: 1
Status: Running
ADB: not connected
Displays: [720 x 1280 ( 320 )]
Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd/1/logs/"
Logs: $SERVICE_URL/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd/1/logs/"
diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})

# Check ADB connection
Expand Down
7 changes: 5 additions & 2 deletions e2etests/cvdr/cvdr_create_with_local_srcs_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ if [ ! -f "${IMAGE_ZIP}" ]; then
exit 1
fi

SERVICE=$(cvdr get_config user_default_service || cvdr get_config system_default_service)
SERVICE_URL=$(cvdr get_config "services[\"$SERVICE\"].service_url")

HOSTNAME=$(cvdr host create)
cleanup() {
cvdr host delete ${HOSTNAME}
Expand All @@ -30,13 +33,13 @@ cvdr create \
# TODO(b/448209030): cvdr list should print proper ADB connection status.
ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
EXPECTED_OUTPUT="Host: ${HOSTNAME}
WebUI: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/
WebUI: $SERVICE_URL/v1/zones/local/hosts/${HOSTNAME}/
Group: cvd_1
Instance: 1
Status: Running
ADB: not connected
Displays: [720 x 1280 ( 320 )]
Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd_1/1/logs/"
Logs: $SERVICE_URL/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd_1/1/logs/"
diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})

# Check ADB connection
Expand Down
Loading