Merge "Revert "Test that /proc files have proc_type attribute.""

tests/sepolicy_tests.py

@@ -11,9 +11,6 @@ import sys
 def TestDataTypeViolations(pol):
     return pol.AssertPathTypesHaveAttr(["/data/"], [], "data_file_type")
 
-def TestProcTypeViolations(pol):
-    return pol.AssertGenfsFilesystemTypesHaveAttr("proc", "proc_type")
-
 def TestSysfsTypeViolations(pol):
     ret = pol.AssertGenfsFilesystemTypesHaveAttr("sysfs", "sysfs_type")
     ret += pol.AssertPathTypesHaveAttr(["/sys/"], ["/sys/kernel/debug/",
@@ -51,14 +48,9 @@ class MultipleOption(Option):
         else:
             Option.take_action(self, action, dest, opt, value, values, parser)
 
-Tests = [
-    "TestDataTypeViolators",
-    "TestProcTypeViolations",
-    "TestSysfsTypeViolations",
-    "TestDebugfsTypeViolations",
-    "TestVendorTypeViolations",
-    "TestCoreDataTypeViolations",
-]
+Tests = ["TestDataTypeViolators", "TestSysfsTypeViolations",
+        "TestDebugfsTypeViolations", "TestVendorTypeViolations",
+        "TestCoreDataTypeViolations"]
 
 if __name__ == '__main__':
     usage = "sepolicy_tests -l $(ANDROID_HOST_OUT)/lib64/libsepolwrap.so "
@@ -99,8 +91,6 @@ if __name__ == '__main__':
     # If an individual test is not specified, run all tests.
     if options.test is None or "TestDataTypeViolations" in options.test:
         results += TestDataTypeViolations(pol)
-    if options.test is None or "TestProcTypeViolations" in options.test:
-        results += TestProcTypeViolations(pol)
     if options.test is None or "TestSysfsTypeViolations" in options.test:
         results += TestSysfsTypeViolations(pol)
     if options.test is None or "TestDebugfsTypeViolations" in options.test: