feat: split E2E tests into e2e and e2e_root tiers, fix service names

xaionaro@dx.center · xaionaro@dx.center · commit fe34460e14c3 · 2026-03-29T16:00:56.000Z
Split the E2E test suite into two build-tag tiers:
- `e2e` — normal tests running as shell (UID 2000)
- `e2e_root` — tests requiring root + permissive SELinux

Moved 15 root-requiring tests (WiFi scanner, keystore, notifications,
device policy, system update, netd OEM network) to usecase_root_test.go
with a separate TestMain in root_main_test.go that requires UID 0.

Fixed service name constants: DreamService "dream" -&gt; "dreams",
EuiccService "euicc" -&gt; "econtroller" (matching actual binder
registrations vs incorrect android.content.Context constants).

Fixed netd tests to use AIDL HAL name "android.system.net.netd.INetd/default"
instead of inaccessible framework "netd" service. Converted sequential
method calls in NetworkMonitor and AttestationVerify to subtests so
API-36-removed methods skip independently without blocking passing tests.

Result: e2e tier drops from 26 skips to 3 (all legitimate: emulator-only
factory reset, API 36 removed method, transient BLE). Root tier passes
12/15 tests (3 HAL-level skips on this device).
diff --git a/servicemanager/service_names_gen.go b/servicemanager/service_names_gen.go
diff --git a/specs/servicemanager/spec.yaml b/specs/servicemanager/spec.yaml
@@ -168,9 +168,9 @@ services:
     - service_name: download
       constant_name: DOWNLOAD_SERVICE
       descriptor: ""
-    - service_name: dream
+    - service_name: dreams
       constant_name: DREAM_SERVICE
-      descriptor: ""
+      descriptor: android.service.dreams.IDreamManager
     - service_name: dropbox
       constant_name: DROPBOX_SERVICE
       descriptor: com.android.internal.os.IDropBoxManagerService
@@ -183,9 +183,9 @@ services:
     - service_name: ethernet
       constant_name: ETHERNET_SERVICE
       descriptor: ""
-    - service_name: euicc
+    - service_name: econtroller
       constant_name: EUICC_SERVICE
-      descriptor: ""
+      descriptor: com.android.internal.telephony.euicc.IEuiccController
     - service_name: euicc_card
       constant_name: EUICC_CARD_SERVICE
       descriptor: ""
diff --git a/tests/e2e/bindercli_test.go b/tests/e2e/bindercli_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e && !e2e_root
 
 package e2e
 
@@ -37,12 +37,6 @@ var emulatorSerial string
 // so cleanup only kills it if we own it.
 var emulatorStartedByTest bool
 
-// onDevice reports whether the test binary is running directly on an
-// Android device (i.e. /dev/binder is accessible). When true, the
-// emulator/adb setup is skipped — on-device tests open /dev/binder
-// directly, and bindercli tests exec the binary directly.
-var onDevice bool
-
 // bindercliAvailable is true when the bindercli binary exists at
 // deviceBinary. On-device, this requires the binary to have been
 // pushed separately; on-host it is built and pushed by TestMain.
diff --git a/tests/e2e/bluetooth_gatt_test.go b/tests/e2e/bluetooth_gatt_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
diff --git a/tests/e2e/camera_capture_test.go b/tests/e2e/camera_capture_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
diff --git a/tests/e2e/concurrent_stress_test.go b/tests/e2e/concurrent_stress_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
@@ -22,6 +22,12 @@ import (
 	"github.com/AndroidGoLab/binder/servicemanager"
 )
 
+// onDevice reports whether the test binary is running directly on an
+// Android device (i.e. /dev/binder is accessible). When true, the
+// emulator/adb setup is skipped — on-device tests open /dev/binder
+// directly, and bindercli tests exec the binary directly.
+var onDevice bool
+
 // cachedBinder provides a shared binder connection with auto-recovery.
 // The connection is refreshed every maxTestsPerConnection tests to
 // prevent accumulated state from degrading performance. A watchdog
diff --git a/tests/e2e/exceptions_test.go b/tests/e2e/exceptions_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
diff --git a/tests/e2e/root_main_test.go b/tests/e2e/root_main_test.go
@@ -0,0 +1,33 @@
+//go:build e2e_root
+
+package e2e
+
+import (
+	"os"
+	"testing"
+)
+
+func TestMain(m *testing.M) {
+	// Root tests REQUIRE UID 0 (adb root) and permissive SELinux
+	// (setenforce 0) to bypass service_manager restrictions for HALs
+	// and privileged system services.
+	//
+	// WARNING: These tests intentionally skip the root-refusal guard in
+	// bindercli_test.go. Only read-only queries are performed — no
+	// destructive operations (e.g. DeleteAllKeys, WipeData) are called.
+	// Review every new root test for safety before adding it here.
+	if os.Getuid() != 0 {
+		os.Stderr.WriteString("FATAL: e2e_root tests require root (UID 0).\n")
+		os.Stderr.WriteString("Run: adb root && adb shell setenforce 0\n")
+		os.Stderr.WriteString("Then push and execute the e2e_root binary.\n")
+		os.Exit(1)
+	}
+
+	if _, err := os.Stat("/dev/binder"); err != nil {
+		os.Stderr.WriteString("FATAL: /dev/binder not found — must run on device.\n")
+		os.Exit(1)
+	}
+
+	onDevice = true
+	os.Exit(m.Run())
+}
diff --git a/tests/e2e/usecase_camera_bluetooth_test.go b/tests/e2e/usecase_camera_bluetooth_test.go
@@ -1,4 +1,4 @@
-//go:build e2e
+//go:build e2e || e2e_root
 
 package e2e
 
@@ -30,7 +30,6 @@ import (
 	genLE "github.com/AndroidGoLab/binder/android/bluetooth/le"
 	"github.com/AndroidGoLab/binder/android/content"
 	fwkService "github.com/AndroidGoLab/binder/android/frameworks/cameraservice/service"
-	"github.com/AndroidGoLab/binder/android/hardware"
 	genOs "github.com/AndroidGoLab/binder/android/os"
 	"github.com/AndroidGoLab/binder/binder"
 	"github.com/AndroidGoLab/binder/binder/versionaware"
@@ -110,25 +109,8 @@ func TestUseCase22_FlashlightTorch(t *testing.T) {
 	// Clean up listener registration.
 	_ = fwkCam.RemoveListener(ctx, listener)
 
-	t.Run("SetTorchMode", func(t *testing.T) {
-		// Torch control requires the media.camera service. Create a
-		// properly registered client token (same pattern as the
-		// flashlight_torch example).
-		mediaSvc, err := sm.GetService(ctx, servicemanager.MediaCameraService)
-		requireOrSkip(t, err)
-		cam := hardware.NewCameraServiceProxy(mediaSvc)
-
-		token := binder.NewStubBinder(&torchClientToken{})
-		token.RegisterWithTransport(ctx, transport)
-
-		err = cam.SetTorchMode(ctx, cameras[0].CameraId, true, token)
-		requireOrSkip(t, err)
-		t.Log("Torch ON")
-
-		err = cam.SetTorchMode(ctx, cameras[0].CameraId, false, token)
-		requireOrSkip(t, err)
-		t.Log("Torch OFF")
-	})
+	// SetTorchMode subtest moved to usecase_root_test.go — requires root
+	// to bypass media.camera SELinux restrictions (kernel status -61).
 }
 
 // torchClientToken is a minimal TransactionReceiver used as the client
@@ -205,22 +187,8 @@ func TestUseCase23_CameraAvailability(t *testing.T) {
 		}
 	})
 
-	t.Run("GetCameraCharacteristics", func(t *testing.T) {
-		listener := fwkService.NewCameraServiceListenerStub(&noopCameraServiceListener{})
-		cameras, err := fwkCam.AddListener(ctx, listener)
-		requireOrSkip(t, err)
-		defer func() { _ = fwkCam.RemoveListener(ctx, listener) }()
-
-		if len(cameras) == 0 {
-			t.Skip("no cameras available")
-		}
-
-		chars, err := fwkCam.GetCameraCharacteristics(ctx, cameras[0].CameraId)
-		requireOrSkip(t, err)
-		t.Logf("Camera %q characteristics: %d bytes of metadata",
-			cameras[0].CameraId, len(chars.Metadata))
-		assert.Greater(t, len(chars.Metadata), 0, "expected non-empty camera metadata")
-	})
+	// GetCameraCharacteristics subtest moved to usecase_root_test.go —
+	// returns HAL ServiceSpecific error as shell.
 }
 
 // ---------------------------------------------------------------------------
diff --git a/tests/e2e/usecase_enterprise_devtools_test.go b/tests/e2e/usecase_enterprise_devtools_test.go
@@ -101,13 +101,8 @@ func TestUseCase84_MDMAgent(t *testing.T) {
 		t.Logf("Camera disabled: %v", camDisabled)
 	})
 
-	// Device provisioned.
-	t.Run("device_provisioned", func(t *testing.T) {
-		provisioned, err := dpm.IsDeviceProvisioned(ctx)
-		requireOrSkip(t, err)
-		assert.True(t, provisioned, "device should be provisioned")
-		t.Logf("Device provisioned: %v", provisioned)
-	})
+	// device_provisioned subtest moved to usecase_root_test.go —
+	// requires system permission.
 
 	// Active admins.
 	t.Run("active_admins", func(t *testing.T) {
@@ -148,16 +143,8 @@ func TestUseCase85_ComplianceChecker(t *testing.T) {
 		t.Logf("Global security state bundle retrieved successfully")
 	})
 
-	// System update info.
-	t.Run("system_update", func(t *testing.T) {
-		updateMgr, err := genOs.GetSystemUpdateManager(ctx, sm)
-		requireOrSkip(t, err)
-
-		info, err := updateMgr.RetrieveSystemUpdateInfo(ctx)
-		requireOrSkip(t, err)
-		_ = info
-		t.Logf("System update info retrieved successfully")
-	})
+	// system_update subtest moved to usecase_root_test.go —
+	// requires READ_SYSTEM_UPDATE_INFO permission.
 }
 
 // --- #86: Remote Diagnostics ---
@@ -267,16 +254,8 @@ func TestUseCase88_OTAStatus(t *testing.T) {
 	driver := openBinder(t)
 	sm := servicemanager.New(driver)
 
-	// System update info.
-	t.Run("system_update", func(t *testing.T) {
-		updateMgr, err := genOs.GetSystemUpdateManager(ctx, sm)
-		requireOrSkip(t, err)
-
-		info, err := updateMgr.RetrieveSystemUpdateInfo(ctx)
-		requireOrSkip(t, err)
-		_ = info
-		t.Logf("System update info bundle retrieved")
-	})
+	// system_update subtest moved to usecase_root_test.go —
+	// requires READ_SYSTEM_UPDATE_INFO permission.
 
 	// Recovery system LSKF state.
 	t.Run("recovery", func(t *testing.T) {
diff --git a/tests/e2e/usecase_media_notifications_test.go b/tests/e2e/usecase_media_notifications_test.go
@@ -320,17 +320,8 @@ func TestUseCase66_NotificationListener_GetEffectsSuppressor(t *testing.T) {
 	t.Logf("Effects suppressor: %+v", suppressor)
 }
 
-func TestUseCase66_NotificationListener_GetActiveNotifications(t *testing.T) {
-	ctx := context.Background()
-	driver := openBinder(t)
-	svc := getService(ctx, t, driver, string(servicemanager.NotificationService))
-
-	nm := genApp.NewNotificationManagerProxy(svc)
-
-	notifs, err := nm.GetActiveNotifications(ctx, "com.android.shell")
-	requireOrSkip(t, err)
-	t.Logf("Active notifications: %d", len(notifs))
-}
+// TestUseCase66_NotificationListener_GetActiveNotifications moved to
+// usecase_root_test.go — requires ACCESS_NOTIFICATIONS permission.
 
 // --- #67: StatusBar Control ---
 
@@ -410,17 +401,8 @@ func TestUseCase68_DNDController_GetConsolidatedNotificationPolicy(t *testing.T)
 	t.Logf("Consolidated notification policy: %+v", policy)
 }
 
-func TestUseCase68_DNDController_ShouldHideSilentStatusIcons(t *testing.T) {
-	ctx := context.Background()
-	driver := openBinder(t)
-	svc := getService(ctx, t, driver, string(servicemanager.NotificationService))
-
-	nm := genApp.NewNotificationManagerProxy(svc)
-
-	hidden, err := nm.ShouldHideSilentStatusIcons(ctx, "com.android.shell")
-	requireOrSkip(t, err)
-	t.Logf("Hide silent status icons: %v", hidden)
-}
+// TestUseCase68_DNDController_ShouldHideSilentStatusIcons moved to
+// usecase_root_test.go — requires notification listener access.
 
 // --- #69: Dream Manager ---
 
@@ -486,17 +468,8 @@ func TestUseCase60_VolumeControl_IsMicrophoneMuted(t *testing.T) {
 	t.Logf("Microphone muted: %v", muted)
 }
 
-func TestUseCase61_AudioFocus_IsUltrasoundSupported(t *testing.T) {
-	ctx := context.Background()
-	driver := openBinder(t)
-	svc := getService(ctx, t, driver, string(servicemanager.AudioService))
-
-	audio := genMedia.NewAudioServiceProxy(svc)
-
-	supported, err := audio.IsUltrasoundSupported(ctx)
-	requireOrSkip(t, err)
-	t.Logf("Ultrasound supported: %v", supported)
-}
+// TestUseCase61_AudioFocus_IsUltrasoundSupported moved to
+// usecase_root_test.go — requires ACCESS_ULTRASOUND permission.
 
 // Verify test file compiles with all required imports.
 var _ = require.NoError
diff --git a/tests/e2e/usecase_monitoring_test.go b/tests/e2e/usecase_monitoring_test.go
@@ -355,30 +355,38 @@ func TestUsecase_NetworkMonitor(t *testing.T) {
 	t.Logf("Network interfaces: %v", ifaces)
 	require.NotEmpty(t, ifaces)
 
-	// IP forwarding.
-	fwd, err := net.GetIpForwardingEnabled(ctx)
-	requireOrSkip(t, err)
-	t.Logf("IP forwarding: %v", fwd)
+	// Each method tested independently — some may be removed in newer
+	// API levels (e.g. API 36 removed getIpForwardingEnabled,
+	// isTetheringStarted).
+	t.Run("IpForwarding", func(t *testing.T) {
+		fwd, err := net.GetIpForwardingEnabled(ctx)
+		requireOrSkip(t, err)
+		t.Logf("IP forwarding: %v", fwd)
+	})
 
-	// Bandwidth control.
-	bw, err := net.IsBandwidthControlEnabled(ctx)
-	requireOrSkip(t, err)
-	t.Logf("Bandwidth control: %v", bw)
+	t.Run("BandwidthControl", func(t *testing.T) {
+		bw, err := net.IsBandwidthControlEnabled(ctx)
+		requireOrSkip(t, err)
+		t.Logf("Bandwidth control: %v", bw)
+	})
 
-	// Firewall state.
-	fw, err := net.IsFirewallEnabled(ctx)
-	requireOrSkip(t, err)
-	t.Logf("Firewall: %v", fw)
+	t.Run("Firewall", func(t *testing.T) {
+		fw, err := net.IsFirewallEnabled(ctx)
+		requireOrSkip(t, err)
+		t.Logf("Firewall: %v", fw)
+	})
 
-	// Tethering.
-	teth, err := net.IsTetheringStarted(ctx)
-	requireOrSkip(t, err)
-	t.Logf("Tethering: %v", teth)
+	t.Run("Tethering", func(t *testing.T) {
+		teth, err := net.IsTetheringStarted(ctx)
+		requireOrSkip(t, err)
+		t.Logf("Tethering: %v", teth)
+	})
 
-	// Network restriction for root.
-	restricted, err := net.IsNetworkRestricted(ctx, 0)
-	requireOrSkip(t, err)
-	t.Logf("UID 0 restricted: %v", restricted)
+	t.Run("NetworkRestriction", func(t *testing.T) {
+		restricted, err := net.IsNetworkRestricted(ctx, 0)
+		requireOrSkip(t, err)
+		t.Logf("UID 0 restricted: %v", restricted)
+	})
 }
 
 // ==========================================================================
diff --git a/tests/e2e/usecase_root_test.go b/tests/e2e/usecase_root_test.go
diff --git a/tests/e2e/usecase_security_telephony_test.go b/tests/e2e/usecase_security_telephony_test.go
diff --git a/tests/e2e/usecase_wifi_packages_test.go b/tests/e2e/usecase_wifi_packages_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build e2e`
	`1`	`+//go:build e2e \|\| e2e_root`
`2`	`2`
`3`	`3`	`package e2e`
`4`	`4`