commit 48bb20c7a0dbdf5fe3160b52f8c609b6561f7fd9
author Zim <zezeozue@google.com> Tue Jun 09 12:47:13 2020 +0100
committer Nandana Dutt <nandana@google.com> Thu Jul 02 08:58:23 2020 +0000
tree fb02973992cf4a730d41d82cf00ec7cfc0fcfb4e
parent 490fd0c126fcb3e5bf7522fbc90ac2166adddbd0

Fix CTS for Iaf8054bf56bdc3bb1f71a1ee543ebb261fd58fbd

Bug: 158226779
Test: atest ScopedStorageTest#testVfsCacheConsistency
Change-Id: Iab3d32950ab43c0ec4d880ce29edaa3eb76a6052
Merged-In: Iab3d32950ab43c0ec4d880ce29edaa3eb76a6052
(cherry picked from commit 96ff5633ee3bc4e58660d0447d5323132d22f749)

hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java

diff --git a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
index d3b109b..54ce150 100644
--- a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
+++ b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
@@ -867,14 +867,14 @@
         try {
             assertThat(file.createNewFile()).isTrue();
 
-            // Since we can only place one F_WRLCK, the second open for readPfd will go
-            // throuh FUSE
+            // We upgrade 'w' only to 'rw'
             ParcelFileDescriptor writePfd = openWithMediaProvider(file, "w");
             ParcelFileDescriptor readPfd = openWithMediaProvider(file, "rw");
 
             assertRWR(readPfd, writePfd);
+            assertRWR(writePfd, readPfd); // Can read on 'w' only pfd
             assertLowerFsFd(writePfd);
-            assertUpperFsFd(readPfd); // Without cache
+            assertLowerFsFd(readPfd);
         } finally {
             file.delete();
         }