| commit | e18732741b68c4bc2d92141a2fbe6e33d46dc19b | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Dec 16 15:18:08 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Dec 16 23:35:13 2014 +0000 |
| tree | 6a33d141373b00a42b3c0be164ccab2e33194342 | |
| parent | dac4e3f459cb23b12b4d5180e17c00208acdbb23 [diff] |
Relax /dev/diag test Rather than asserting that /dev/diag isn't present, only assert that it's not readable / writable. It may be used by other parts of Android. Bug: 18776555 Change-Id: I63f3193ab9ae8bcad259e9ee607239a805ec9bd4
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java index c31c484..babc93f 100755 --- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java +++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -151,6 +151,14 @@ } @MediumTest + public void testDevDiagSane() throws Exception { + File f = new File("/dev/diag"); + assertFalse(f.canRead()); + assertFalse(f.canWrite()); + assertFalse(f.canExecute()); + } + + @MediumTest public void testDevMemSane() throws Exception { File f = new File("/dev/mem"); assertFalse(f.canRead());
diff --git a/tests/tests/security/src/android/security/cts/BannedFilesTest.java b/tests/tests/security/src/android/security/cts/BannedFilesTest.java index 8076f8e..00c4631 100644 --- a/tests/tests/security/src/android/security/cts/BannedFilesTest.java +++ b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
@@ -131,14 +131,6 @@ assertNotSetugid("/vendor/bin/tcpdump-arm"); } - /** - * Test if /dev/diag exists. - */ - public void testNoDevDiag(){ - File file = new File("/dev/diag"); - assertFalse("File \"" + file.getAbsolutePath() + "\" exists", file.exists()); - } - private static void assertNotSetugid(String file) { FileUtils.FileStatus fs = new FileUtils.FileStatus(); if (!FileUtils.getFileStatus(file, fs, false)) {