diff --git a/test/installation/main.py b/test/installation/main.py index 9ff78682288769c92dcc81c153bf8ec055596c30..a751126381deb4e9018c5738c6c88c7e74d1e458 100644 --- a/test/installation/main.py +++ b/test/installation/main.py @@ -17,6 +17,7 @@ def RunLongStableCase(): suite = unittest.TestSuite() suite.addTest(TestInstallSource("test_install_source_FUN")) suite.addTest(TestInstallYum("test_install_yum_FUN")) + suite.addTest(TestInstallYum("test_instatll_yum_RBT_update")) suite.addTest(TestInstallYum("test_instatll_yum_RBT_start")) suite.addTest(TestInstallYum("test_instatll_yum_RBT_stop")) return suite diff --git a/test/installation/test_install_yum.py b/test/installation/test_install_yum.py index 90d9fc3b2316fb8253f7f680c239ad0c9428c57d..597f256e013bc0a9e283868f8c0bef2d479b3989 100644 --- a/test/installation/test_install_yum.py +++ b/test/installation/test_install_yum.py @@ -35,17 +35,30 @@ class TestInstallYum(unittest.TestCase): def setUp(self) -> None: os_type = getOsType() self.assertEqual(os_type, "redhat") - self.keentune = ["keentuned", "keentune-target", "keentune-brain", "keentune-bench"] + self.keentune = ["keentune-target", "keentune-brain", "keentune-bench", "keentuned"] def tearDown(self) -> None: logger.info("the test_install_yum testcase finished") def install_server(self): + server_version = { + "keentuned": "keentuned-2.0.0-0.an8.x86_64", + "keentune-target": "keentune-target-2.0.0-0.an8.noarch", + "keentune-brain": "keentune-brain-2.0.0-0.an8.noarch", + "keentune-bench": "keentune-bench-1.4.0-0.an8.noarch" + } for server in self.keentune: - cmd = "yum install -y {0};systemctl restart {0}".format(server) + cmd = "yum install -y {};systemctl restart {}".format(server_version[server], server) self.assertEqual(sysCommand(cmd)[0], 0) time.sleep(3) + def run_param_tune(self): + self.status = checkServerStatus(self.keentune) + self.assertEqual(self.status, 0) + self.status = runParamTune("param1") + self.assertEqual(self.status, 0) + deleteDependentData("param1") + def test_install_yum_FUN(self): self.status = sysCommand("pip3 install --upgrade pip")[0] self.assertEqual(self.status, 0) @@ -61,13 +74,14 @@ class TestInstallYum(unittest.TestCase): self.assertEqual(sysCommand(cmd)[0], 0) self.install_server() - - self.status = checkServerStatus(self.keentune) - self.assertEqual(self.status, 0) - self.status = runParamTune("param1") - self.assertEqual(self.status, 0) - deleteDependentData("param1") + def test_instatll_yum_RBT_update(self): + for server in self.keentune: + cmd = "yum update -y {0};systemctl restart {0}".format(server) + self.assertEqual(sysCommand(cmd)[0], 0) + time.sleep(3) + self.run_param_tune() + def test_instatll_yum_RBT_start(self): for server in self.keentune: cmd = "systemctl restart {0};systemctl status {0}".format(server)