commit 9ab13e5cc574474292499b2ffef53a84de0f32de
author Victor Hsieh <victorhsieh@google.com> Tue Jun 29 09:23:29 2021 -0700
committer Victor Hsieh <victorhsieh@google.com> Tue Jun 29 09:25:41 2021 -0700
tree 8c8afb6d04bf25876325ed2f06c2aa0d6aaf85da
parent ec5012d888cabce13e9a075a84d1f754d76b870d

authfs: Fix broken test

testReadWithFsverityVerification_LocalFile was broken because of binder
connection timeout. The binder connection wasn't necessary in the test
case with only local file.

Test: atest com.android.virt.fs.AuthFsHostTest
Change-Id: I5b0ae9ca8db650547ebbb53dfeaf3141a1e9f4ac

authfs/src/main.rs

diff --git a/authfs/src/main.rs b/authfs/src/main.rs
index 593fa74..d03e3ca 100644
--- a/authfs/src/main.rs
+++ b/authfs/src/main.rs
@@ -92,6 +92,14 @@
     debug: bool,
 }
 
+impl Args {
+    fn has_remote_files(&self) -> bool {
+        !self.remote_ro_file.is_empty()
+            || !self.remote_ro_file_unverified.is_empty()
+            || !self.remote_new_rw_file.is_empty()
+    }
+}
+
 struct OptionRemoteRoFile {
     ino: Inode,
 
@@ -273,27 +281,37 @@
 fn prepare_file_pool(args: &Args) -> Result<BTreeMap<Inode, FileConfig>> {
     let mut file_pool = BTreeMap::new();
 
-    let service = file::get_binder_service(args.cid)?;
+    if args.has_remote_files() {
+        let service = file::get_binder_service(args.cid)?;
 
-    for config in &args.remote_ro_file {
-        file_pool.insert(
-            config.ino,
-            new_config_remote_verified_file(service.clone(), config.remote_id, config.file_size)?,
-        );
-    }
+        for config in &args.remote_ro_file {
+            file_pool.insert(
+                config.ino,
+                new_config_remote_verified_file(
+                    service.clone(),
+                    config.remote_id,
+                    config.file_size,
+                )?,
+            );
+        }
 
-    for config in &args.remote_ro_file_unverified {
-        file_pool.insert(
-            config.ino,
-            new_config_remote_unverified_file(service.clone(), config.remote_id, config.file_size)?,
-        );
-    }
+        for config in &args.remote_ro_file_unverified {
+            file_pool.insert(
+                config.ino,
+                new_config_remote_unverified_file(
+                    service.clone(),
+                    config.remote_id,
+                    config.file_size,
+                )?,
+            );
+        }
 
-    for config in &args.remote_new_rw_file {
-        file_pool.insert(
-            config.ino,
-            new_config_remote_new_verified_file(service.clone(), config.remote_id)?,
-        );
+        for config in &args.remote_new_rw_file {
+            file_pool.insert(
+                config.ino,
+                new_config_remote_new_verified_file(service.clone(), config.remote_id)?,
+            );
+        }
     }
 
     for config in &args.local_ro_file {