Merge "treble sepolicy tests: Add removed attribute check." into oc-mr1-dev

am: 51572137

Change-Id: I2137c4aff726537196f6799d5368fa2391e7f019

tests/policy.py

@@ -124,8 +124,8 @@ class Policy:
             yield Rule
 
 
-    def GetAllTypes(self):
-        TypeIterP = self.__libsepolwrap.init_type_iter(self.__policydbP, None, False)
+    def GetAllTypes(self, isAttr):
+        TypeIterP = self.__libsepolwrap.init_type_iter(self.__policydbP, None, isAttr)
         if (TypeIterP == None):
             sys.exit("Failed to initialize type iterator")
         buf = create_string_buffer(self.__BUFSIZE)

tests/sepol_wrap.cpp

@@ -98,13 +98,15 @@ int get_type(char *out, size_t max_size, void *policydbp, void *type_iterp)
             break;
         }
     }
-    if (i->bit >= i->length)
-        return 1;
-    while ((i->alltypes == TYPE_ITER_ALLATTRS
+    while (i->bit < i->length &&
+           ((i->alltypes == TYPE_ITER_ALLATTRS
             && db->type_val_to_struct[i->bit]->flavor != TYPE_ATTRIB)
             || (i->alltypes == TYPE_ITER_ALLTYPES
-            && db->type_val_to_struct[i->bit]->flavor != TYPE_TYPE))
+            && db->type_val_to_struct[i->bit]->flavor != TYPE_TYPE))) {
         i->bit++;
+    }
+    if (i->bit >= i->length)
+        return 1;
     len = snprintf(out, max_size, "%s", db->p_type_val_to_name[i->bit]);
     if (len >= max_size) {
         std::cerr << "type name exceeds buffer size." << std::endl;

tests/treble_sepolicy_tests.py

@@ -155,8 +155,8 @@ def GetAttributes(pol):
 def GetAllTypes(pol, oldpol):
     global alltypes
     global oldalltypes
-    alltypes = pol.GetAllTypes()
-    oldalltypes = oldpol.GetAllTypes()
+    alltypes = pol.GetAllTypes(False)
+    oldalltypes = oldpol.GetAllTypes(False)
 
 def setup(pol):
     GetAllDomains(pol)