From d0fe6b407e7265ba5d8caaa8e9280799256cbbc5 Mon Sep 17 00:00:00 2001 From: "Jorge E. Moreira" Date: Thu, 9 Apr 2026 13:34:46 -0700 Subject: [PATCH] Revert "Run powerwash tests on gfxstream modes" This reverts commit 8f8e38e353c8836a50543bbf6664c8a2aa0a7afd. Bug: b/501148510 --- .../{default => }/BUILD.bazel | 2 - .../cvd_powerwash_tests/common/BUILD.bazel | 25 ------- .../cvd/cvd_powerwash_tests/common/common.go | 49 ------------- .../cvd_powerwash_tests/default/main_test.go | 69 ------------------- .../cvd/cvd_powerwash_tests/gpu/BUILD.bazel | 52 -------------- .../{gpu => }/main_test.go | 40 ++++++----- 6 files changed, 21 insertions(+), 216 deletions(-) rename e2etests/cvd/cvd_powerwash_tests/{default => }/BUILD.bazel (93%) delete mode 100644 e2etests/cvd/cvd_powerwash_tests/common/BUILD.bazel delete mode 100644 e2etests/cvd/cvd_powerwash_tests/common/common.go delete mode 100644 e2etests/cvd/cvd_powerwash_tests/default/main_test.go delete mode 100644 e2etests/cvd/cvd_powerwash_tests/gpu/BUILD.bazel rename e2etests/cvd/cvd_powerwash_tests/{gpu => }/main_test.go (61%) diff --git a/e2etests/cvd/cvd_powerwash_tests/default/BUILD.bazel b/e2etests/cvd/cvd_powerwash_tests/BUILD.bazel similarity index 93% rename from e2etests/cvd/cvd_powerwash_tests/default/BUILD.bazel rename to e2etests/cvd/cvd_powerwash_tests/BUILD.bazel index 6a873104e37..655eb27dcdf 100644 --- a/e2etests/cvd/cvd_powerwash_tests/default/BUILD.bazel +++ b/e2etests/cvd/cvd_powerwash_tests/BUILD.bazel @@ -26,7 +26,6 @@ go_test( ], deps = [ "//cvd/common", - "//cvd/cvd_powerwash_tests/common", ], ) @@ -45,6 +44,5 @@ go_test( ], deps = [ "//cvd/common", - "//cvd/cvd_powerwash_tests/common", ], ) diff --git a/e2etests/cvd/cvd_powerwash_tests/common/BUILD.bazel b/e2etests/cvd/cvd_powerwash_tests/common/BUILD.bazel deleted file mode 100644 index 27f6377b5ea..00000000000 --- a/e2etests/cvd/cvd_powerwash_tests/common/BUILD.bazel +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2026 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_go//go:def.bzl", "go_library") - -go_library( - name = "common", - srcs = ["common.go"], - importpath = "github.com/google/android-cuttlefish/e2etests/cvd/cvd_powerwash_tests/common", - visibility = ["//visibility:public"], - deps = [ - "//cvd/common", - ], -) diff --git a/e2etests/cvd/cvd_powerwash_tests/common/common.go b/e2etests/cvd/cvd_powerwash_tests/common/common.go deleted file mode 100644 index f1656d1d44c..00000000000 --- a/e2etests/cvd/cvd_powerwash_tests/common/common.go +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2026 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package provides common functionality for launching and interacting -// with Cuttlefish instances for tests. - -package powerwash_common - -import ( - "fmt" - - "github.com/google/android-cuttlefish/e2etests/cvd/common" -) - -func VerifyPowerwash(c *e2etests.TestContext) error { - if err := c.RunAdbWaitForDevice(); err != nil { - return fmt.Errorf("failed to wait for Cuttlefish device to connect to adb: %w", err) - } - - const tmpFile = "/data/local/tmp/foo" - if _, err := c.RunCmd("adb", "shell", "touch", tmpFile); err != nil { - return fmt.Errorf("failed to create %s: %w", tmpFile, err) - } - - if _, err := c.RunCmd("adb", "shell", "stat", tmpFile); err != nil { - return fmt.Errorf("failed to verify %s created: %w", tmpFile, err) - } - - if err := c.CVDPowerwash(); err != nil { - return fmt.Errorf("failed to run powerwash command: %w", err) - } - - if _, err := c.RunCmd("adb", "shell", "stat", tmpFile); err == nil { - return fmt.Errorf("failed to powerwash, %s still exists", tmpFile) - } - - return nil -} diff --git a/e2etests/cvd/cvd_powerwash_tests/default/main_test.go b/e2etests/cvd/cvd_powerwash_tests/default/main_test.go deleted file mode 100644 index b3a4be3d1fb..00000000000 --- a/e2etests/cvd/cvd_powerwash_tests/default/main_test.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (C) 2026 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package main - -import ( - "fmt" - "testing" - - "github.com/google/android-cuttlefish/e2etests/cvd/common" - "github.com/google/android-cuttlefish/e2etests/cvd/cvd_powerwash_tests/common" -) - -func TestCvdPowerwash(t *testing.T) { - testcases := []struct { - shortName string - branch string - target string - createArgs []string - }{ - { - shortName: "Aosp", - branch: "aosp-android-latest-release", - target: "aosp_cf_x86_64_only_phone-userdebug", - createArgs: []string{}, - }, - { - shortName: "AospGfxstreamSwangle", - branch: "aosp-android-latest-release", - target: "aosp_cf_x86_64_only_phone-userdebug", - createArgs: []string{ - "--gpu_mode=gfxstream_guest_angle_host_swiftshader", - }, - }, - } - c := e2etests.TestContext{} - for _, tc := range testcases { - t.Run(fmt.Sprintf("BUILD=%s", tc.shortName), func(t *testing.T) { - c.SetUp(t) - defer c.TearDown() - - if err := c.CVDFetch(e2etests.FetchArgs{ - DefaultBuildBranch: tc.branch, - DefaultBuildTarget: tc.target, - }); err != nil { - t.Fatal(err) - } - - if err := c.CVDCreate(e2etests.CreateArgs{Args: tc.createArgs}); err != nil { - t.Fatal(err) - } - - if err := powerwash_common.VerifyPowerwash(&c); err != nil { - t.Fatal(err) - } - }) - } -} diff --git a/e2etests/cvd/cvd_powerwash_tests/gpu/BUILD.bazel b/e2etests/cvd/cvd_powerwash_tests/gpu/BUILD.bazel deleted file mode 100644 index b8051530c8a..00000000000 --- a/e2etests/cvd/cvd_powerwash_tests/gpu/BUILD.bazel +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2026 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_go//go:def.bzl", "go_test") - -go_test( - name = "cvd_powerwash_tests", - size = "large", - srcs = ["main_test.go"], - tags = [ - "exclusive", - "external", - "no-sandbox", - "requires_gpu", - "supports-graceful-termination", - ], - deps = [ - "//cvd/common", - "//cvd/cvd_powerwash_tests/common", - ], -) - -go_test( - name = "cvd_powerwash_tests_additional_substitution", - size = "large", - srcs = ["main_test.go"], - data = ["//:debian_substitution_marker"], - env = {"LOCAL_DEBIAN_SUBSTITUTION_MARKER_FILE": "$(rlocationpath //:debian_substitution_marker)"}, - tags = [ - "exclusive", - "external", - "no-sandbox", - "requires_gpu", - "supports-graceful-termination", - - ], - deps = [ - "//cvd/common", - "//cvd/cvd_powerwash_tests/common", - ], -) diff --git a/e2etests/cvd/cvd_powerwash_tests/gpu/main_test.go b/e2etests/cvd/cvd_powerwash_tests/main_test.go similarity index 61% rename from e2etests/cvd/cvd_powerwash_tests/gpu/main_test.go rename to e2etests/cvd/cvd_powerwash_tests/main_test.go index dfc85f2f9f9..097bfa13edb 100644 --- a/e2etests/cvd/cvd_powerwash_tests/gpu/main_test.go +++ b/e2etests/cvd/cvd_powerwash_tests/main_test.go @@ -19,36 +19,21 @@ import ( "testing" "github.com/google/android-cuttlefish/e2etests/cvd/common" - "github.com/google/android-cuttlefish/e2etests/cvd/cvd_powerwash_tests/common" ) func TestCvdPowerwash(t *testing.T) { testcases := []struct { - shortName string branch string target string - createArgs []string }{ { - shortName: "AospGfxstream", branch: "aosp-android-latest-release", target: "aosp_cf_x86_64_only_phone-userdebug", - createArgs: []string{ - "--gpu_mode=gfxstream", - }, - }, - { - shortName: "AospGfxstreamAngle", - branch: "aosp-android-latest-release", - target: "aosp_cf_x86_64_only_phone-userdebug", - createArgs: []string{ - "--gpu_mode=gfxstream_guest_angle", - }, }, } c := e2etests.TestContext{} for _, tc := range testcases { - t.Run(fmt.Sprintf("BUILD=%s", tc.shortName), func(t *testing.T) { + t.Run(fmt.Sprintf("BUILD=%s/%s", tc.branch, tc.target), func(t *testing.T) { c.SetUp(t) defer c.TearDown() @@ -59,13 +44,30 @@ func TestCvdPowerwash(t *testing.T) { t.Fatal(err) } - if err := c.CVDCreate(e2etests.CreateArgs{Args: tc.createArgs}); err != nil { + if err := c.CVDCreate(e2etests.CreateArgs{}); err != nil { t.Fatal(err) } - if err := powerwash_common.VerifyPowerwash(&c); err != nil { + if err := c.RunAdbWaitForDevice(); err != nil { + t.Fatalf("failed to wait for Cuttlefish device to connect to adb: %w", err) + } + + const tmpFile = "/data/local/tmp/foo" + if _, err := c.RunCmd("adb", "shell", "touch", tmpFile); err != nil { + t.Fatalf("failed to create %s: %w", tmpFile, err) + } + + if _, err := c.RunCmd("adb", "shell", "stat", tmpFile); err != nil { + t.Fatal("failed to verify %s created: %w", err) + } + + if err := c.CVDPowerwash(); err != nil { t.Fatal(err) } + + if _, err := c.RunCmd("adb", "shell", "stat", tmpFile); err == nil { + t.Fatal("failed to powerwash, %s still exists") + } }) } -} +} \ No newline at end of file