summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumberto Ibarra <humberto.ibarra.lopez@intel.com>2017-02-13 11:25:37 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:48 -0800
commit5ff7db946cea7d0c3a227bae997f22394bd2e629 (patch)
treecf8981ac5276ea1bfbe5fe0b2fe85b740b74a319
parent88bda7d78d6f20bce48cf6a49d392864f866ae90 (diff)
downloadpoky-5ff7db946cea7d0c3a227bae997f22394bd2e629.tar.gz
oeqa: fix typo
The word 'uninstall' was spelled incorrectly in various parts of oeqa files. (From OE-Core rev: af365e025030436f83b233fa51ecc9c58c58ce3c) (From OE-Core rev: 9d25188e873645b849584b51a77b86588a51d4ba) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/lib/oeqa/runtime/cases/selftest.py6
-rw-r--r--meta/lib/oeqa/oetest.py12
-rw-r--r--meta/lib/oeqa/selftest/runtime-test.py2
-rw-r--r--meta/lib/oeqa/utils/package_manager.py4
4 files changed, 12 insertions, 12 deletions
diff --git a/meta-selftest/lib/oeqa/runtime/cases/selftest.py b/meta-selftest/lib/oeqa/runtime/cases/selftest.py
index 329470f153..19de740623 100644
--- a/meta-selftest/lib/oeqa/runtime/cases/selftest.py
+++ b/meta-selftest/lib/oeqa/runtime/cases/selftest.py
@@ -8,7 +8,7 @@ class Selftest(OERuntimeTestCase):
8 """ 8 """
9 Summary: Check basic package installation functionality. 9 Summary: Check basic package installation functionality.
10 Expected: 1. Before the test socat must be installed using scp. 10 Expected: 1. Before the test socat must be installed using scp.
11 2. After the test socat must be unistalled using ssh. 11 2. After the test socat must be uninstalled using ssh.
12 This can't be checked in this test. 12 This can't be checked in this test.
13 Product: oe-core 13 Product: oe-core
14 Author: Mariano Lopez <mariano.lopez@intel.com> 14 Author: Mariano Lopez <mariano.lopez@intel.com>
@@ -18,10 +18,10 @@ class Selftest(OERuntimeTestCase):
18 self.assertEqual(status, 0, msg="socat is not installed") 18 self.assertEqual(status, 0, msg="socat is not installed")
19 19
20 @OETestDepends(['selftest.Selftest.test_install_package']) 20 @OETestDepends(['selftest.Selftest.test_install_package'])
21 def test_verify_unistall(self): 21 def test_verify_uninstall(self):
22 """ 22 """
23 Summary: Check basic package installation functionality. 23 Summary: Check basic package installation functionality.
24 Expected: 1. test_install_package must unistall socat. 24 Expected: 1. test_install_package must uninstall socat.
25 This test is just to verify that. 25 This test is just to verify that.
26 Product: oe-core 26 Product: oe-core
27 Author: Mariano Lopez <mariano.lopez@intel.com> 27 Author: Mariano Lopez <mariano.lopez@intel.com>
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index b886130d0e..a89bd117c0 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -106,7 +106,7 @@ class oeRuntimeTest(oeTest):
106 pass 106 pass
107 107
108 def tearDown(self): 108 def tearDown(self):
109 # Unistall packages in the DUT 109 # Uninstall packages in the DUT
110 self.tc.install_uninstall_packages(self.id(), False) 110 self.tc.install_uninstall_packages(self.id(), False)
111 111
112 res = getResults() 112 res = getResults()
@@ -546,7 +546,7 @@ class RuntimeTestContext(TestContext):
546 546
547 def install_uninstall_packages(self, test_id, pkg_dir, install): 547 def install_uninstall_packages(self, test_id, pkg_dir, install):
548 """ 548 """
549 Check if the test requires a package and Install/Unistall it in the DUT 549 Check if the test requires a package and Install/Uninstall it in the DUT
550 """ 550 """
551 551
552 test = test_id.split(".")[4] 552 test = test_id.split(".")[4]
@@ -559,7 +559,7 @@ class RuntimeTestContext(TestContext):
559 559
560 def _install_uninstall_packages(self, needed_packages, pkg_dir, install=True): 560 def _install_uninstall_packages(self, needed_packages, pkg_dir, install=True):
561 """ 561 """
562 Install/Unistall packages in the DUT without using a package manager 562 Install/Uninstall packages in the DUT without using a package manager
563 """ 563 """
564 564
565 if isinstance(needed_packages, dict): 565 if isinstance(needed_packages, dict):
@@ -577,7 +577,7 @@ class RuntimeTestContext(TestContext):
577 if install and extract: 577 if install and extract:
578 self.target.connection.copy_dir_to(src_dir, "/") 578 self.target.connection.copy_dir_to(src_dir, "/")
579 579
580 # Unistall package 580 # Uninstall package
581 elif not install and rm: 581 elif not install and rm:
582 self.target.connection.delete_dir_structure(src_dir, "/") 582 self.target.connection.delete_dir_structure(src_dir, "/")
583 583
@@ -600,7 +600,7 @@ class ImageTestContext(RuntimeTestContext):
600 600
601 def install_uninstall_packages(self, test_id, install=True): 601 def install_uninstall_packages(self, test_id, install=True):
602 """ 602 """
603 Check if the test requires a package and Install/Unistall it in the DUT 603 Check if the test requires a package and Install/Uninstall it in the DUT
604 """ 604 """
605 605
606 pkg_dir = self.d.getVar("TEST_EXTRACTED_DIR") 606 pkg_dir = self.d.getVar("TEST_EXTRACTED_DIR")
@@ -623,7 +623,7 @@ class ExportTestContext(RuntimeTestContext):
623 623
624 def install_uninstall_packages(self, test_id, install=True): 624 def install_uninstall_packages(self, test_id, install=True):
625 """ 625 """
626 Check if the test requires a package and Install/Unistall it in the DUT 626 Check if the test requires a package and Install/Uninstall it in the DUT
627 """ 627 """
628 628
629 export_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) 629 export_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index 52e5b27858..a673f36d39 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -102,7 +102,7 @@ class TestImage(oeSelfTest):
102 """ 102 """
103 Summary: Check install packages functionality for testimage/testexport. 103 Summary: Check install packages functionality for testimage/testexport.
104 Expected: 1. Import tests from a directory other than meta. 104 Expected: 1. Import tests from a directory other than meta.
105 2. Check install/unistall of socat. 105 2. Check install/uninstall of socat.
106 Product: oe-core 106 Product: oe-core
107 Author: Mariano Lopez <mariano.lopez@intel.com> 107 Author: Mariano Lopez <mariano.lopez@intel.com>
108 """ 108 """
diff --git a/meta/lib/oeqa/utils/package_manager.py b/meta/lib/oeqa/utils/package_manager.py
index 92646488da..724afb2b5e 100644
--- a/meta/lib/oeqa/utils/package_manager.py
+++ b/meta/lib/oeqa/utils/package_manager.py
@@ -187,7 +187,7 @@ def test_needs_package(test_case):
187 187
188def _install_uninstall_packages(needed_packages, test_case, install=True): 188def _install_uninstall_packages(needed_packages, test_case, install=True):
189 """ 189 """
190 Install/Unistall packages in the DUT without using a package manager 190 Install/Uninstall packages in the DUT without using a package manager
191 """ 191 """
192 192
193 if isinstance(needed_packages, dict): 193 if isinstance(needed_packages, dict):
@@ -205,6 +205,6 @@ def _install_uninstall_packages(needed_packages, test_case, install=True):
205 if install and extract: 205 if install and extract:
206 test_case.tc.target.copyDirTo(src_dir, '/') 206 test_case.tc.target.copyDirTo(src_dir, '/')
207 207
208 # Unistall package 208 # Uninstall package
209 elif not install and rm: 209 elif not install and rm:
210 test_case.tc.target.deleteDirStructure(src_dir, '/') 210 test_case.tc.target.deleteDirStructure(src_dir, '/')