commit c4d5953a0b623a2a66cdc30b2219be02a9dedbb0
author Jaekyun Seok <jaekyun@google.com> Tue Jun 19 09:22:02 2018 +0900
committer Inseob Kim <inseob@google.com> Mon Mar 18 15:52:10 2019 +0900
tree 9a3b23d92df7c18ee0af442e3768ad6af0a86c07
parent 39596d074f9a1e77d1e3d2055d98135ca1e9f865

Revert "Remove testVendorPropertyNamespace"

This reverts commit f4a2607a8daa76f341a9737981738f53021efe71.

Bug: 77841828
Test: no tests
Change-Id: I82bc5d931197684be9f5ca623a55f42cbdc1fd84
Merged-In: I82bc5d931197684be9f5ca623a55f42cbdc1fd84
(cherry picked from commit 496765e52a5774c95c8dab527eafea477894c098)

system_property/VtsTrebleSysPropTest.py

diff --git a/system_property/VtsTrebleSysPropTest.py b/system_property/VtsTrebleSysPropTest.py
index 53a3d01..e552db1 100644
--- a/system_property/VtsTrebleSysPropTest.py
+++ b/system_property/VtsTrebleSysPropTest.py
@@ -123,6 +123,45 @@
                 "true",
                 "ro.actionable_compatible_property.enabled must be true")
 
+    def testVendorPropertyNamespace(self):
+        """Ensures vendor properties have proper namespace.
+
+        Vendor or ODM properties must have their own prefix.
+        """
+        logging.info("Checking existence of %s",
+                     self._VENDOR_PROPERTY_CONTEXTS_FILE_PATH)
+        target_file_utils.assertPermissionsAndExistence(
+                self.shell, self._VENDOR_PROPERTY_CONTEXTS_FILE_PATH,
+                target_file_utils.IsReadable)
+
+        # Pull vendor property contexts file from device.
+        self.dut.adb.pull("%s %s" % (self._VENDOR_PROPERTY_CONTEXTS_FILE_PATH,
+                                     self._temp_dir))
+        logging.info("Adb pull %s to %s",
+                     self._VENDOR_PROPERTY_CONTEXTS_FILE_PATH,
+                     self._temp_dir)
+
+        with open(os.path.join(self._temp_dir, "vendor_property_contexts"),
+                  "r") as property_contexts_file:
+            property_dict = self._ParsePropertyDictFromPropertyContextsFile(
+                    property_contexts_file)
+        logging.info("Found %d property names in vendor property contexts",
+                     len(property_dict))
+        violation_list = []
+        for name in property_dict:
+            has_proper_namesapce = False
+            for prefix in self._VENDOR_OR_ODM_NAMEPACES:
+                if name.startswith(prefix):
+                    has_proper_namesapce = True
+                    break
+            if not has_proper_namesapce:
+                violation_list.append(name)
+        asserts.assertEqual(
+                len(violation_list),
+                0,
+                ("Vendor propertes (%s) have wrong namespace" %
+                 (" ".join(sorted(violation_list)))))
+
     def testExportedPlatformPropertyIntegrity(self):
         """Ensures public property contexts isn't modified at all.