oetest.py: Fix problem when there is more than one json file for package extraction

PATCH New [email protected] 1 participant 1 message Jul 13, 2016 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

author

2016-07-13 19:53 UTC #1 lore raw

PATCH 1/1 oetest.py: Fix problem when there is more than one json file for package extraction

From: Mariano Lopez <[email protected]>

This allow to have more than one test to have json file in order to install packages in the DUT without using a package manager.

[YOCTO #9926]

Signed-off-by Mariano Lopez <[email protected]>

---
 meta/lib/oeqa/oetest.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

meta/lib/oeqa/oetest.py +10 -4

index 4a740fb..e63ca56 100644
@@ -441,12 +441,9 @@ class RuntimeTestContext(TestContext):
 
     def extract_packages(self):
         """
-        Find and extract packages that will be needed during runtime.
+        Find packages that will be needed during runtime.
         """
 
-        needed_packages = {}
-        extracted_path = self.d.getVar("TEST_EXTRACTED_DIR", True)
-        packaged_path = self.d.getVar("TEST_PACKAGED_DIR", True)
         modules = self.getTestModules()
         bbpaths = self.d.getVar("BBPATH", True).split(":")

@@ -454,6 +451,15 @@ class RuntimeTestContext(TestContext):
             json_file = self._getJsonFile(module)
             if json_file:
                 needed_packages = self._getNeededPackages(json_file)
+                self._perform_package_extraction(needed_packages)
+
+    def _perform_package_extraction(self, needed_packages):
+        """
+        Extract packages that will be needed during runtime.
+        """
+
+        extracted_path = self.d.getVar("TEST_EXTRACTED_DIR", True)
+        packaged_path = self.d.getVar("TEST_PACKAGED_DIR", True)
 
         for key,value in needed_packages.items():
             packages = ()

Signature · 1 line

2.6.6