summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-10 21:07:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-11-10 21:07:15 +0000
commit55f00edae49bbbcd7bacaf58886434218e0aca63 (patch)
tree57e83bba664f53813289a2db4d9a80165650e413
parent0a5f4390cf7da40bcce1c0fcdaf3b710afdd6d45 (diff)
parent56b3780e957e8352a4fc20ea864a65842e609da6 (diff)
downloadcts-sparse-7903266-L22400000952157982.tar.gz
Merge "Snap for 7903125 from 88aec4d93228d8b6c790b24229d8769a4c2cc423 to android11-tests-release" into android11-tests-releasesparse-7903266-L22400000952157982
-rw-r--r--tools/selinux/SELinuxNeverallowTestFrame.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/selinux/SELinuxNeverallowTestFrame.py b/tools/selinux/SELinuxNeverallowTestFrame.py
index 120687e1138..2ba302b4457 100644
--- a/tools/selinux/SELinuxNeverallowTestFrame.py
+++ b/tools/selinux/SELinuxNeverallowTestFrame.py
@@ -142,7 +142,6 @@ src_method = """
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();
@@ -150,6 +149,7 @@ src_method = """
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);