commit e361287aa343c6e824e6d9b07767bb29147e6027
author Guang Zhu <guangzhu@google.com> Sat Oct 02 19:50:36 2021 +0000
committer Guang Zhu <guangzhu@google.com> Sun Oct 03 05:50:31 2021 +0000
tree 11608e439e052c3a9de49e9377fd6b393cc9b30b
parent 12801dda9c40d0b8b99626d416de5f8a66914523

Read process output before waiting for it to finish

Otherwise process may hang when output buffer is full.

Test: verified with a setup showing hanging symptoms

Change-Id: Icefa8497d4688c87c9bf8ecbce9d99760013b086

tools/selinux/SELinuxNeverallowTestFrame.py

diff --git a/tools/selinux/SELinuxNeverallowTestFrame.py b/tools/selinux/SELinuxNeverallowTestFrame.py
index 370b40b..5f9f768 100644
--- a/tools/selinux/SELinuxNeverallowTestFrame.py
+++ b/tools/selinux/SELinuxNeverallowTestFrame.py
@@ -155,7 +155,6 @@
         pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
         pb.redirectErrorStream(true);
         Process p = pb.start();
-        p.waitFor();
         BufferedReader result = new BufferedReader(new InputStreamReader(p.getInputStream()));
         String line;
         StringBuilder errorString = new StringBuilder();
@@ -163,6 +162,7 @@
             errorString.append(line);
             errorString.append("\\n");
         }
+        p.waitFor();
         assertTrue("The following errors were encountered when validating the SELinux"
                    + "neverallow rule:\\n" + neverallowRule + "\\n" + errorString,
                    errorString.length() == 0);