This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new d1e7241 [AMBARI-24726] Remove outdated
functions.list_ambari_managed_repos module (dgrinenko) (#2413)
d1e7241 is described below
commit d1e72414da007f5360615e84b294670e79a6100b
Author: Dmytro Grinenko <[email protected]>
AuthorDate: Thu Oct 4 13:44:46 2018 +0300
[AMBARI-24726] Remove outdated functions.list_ambari_managed_repos module
(dgrinenko) (#2413)
---
.../TestListAmbariManagedRepos.py | 127 ---------------------
.../functions/list_ambari_managed_repos.py | 57 ---------
.../python/custom_actions/TestInstallPackages.py | 55 ++-------
.../custom_actions/TestRemoveStackVersion.py | 14 +--
4 files changed, 15 insertions(+), 238 deletions(-)
diff --git
a/ambari-agent/src/test/python/resource_management/TestListAmbariManagedRepos.py
b/ambari-agent/src/test/python/resource_management/TestListAmbariManagedRepos.py
deleted file mode 100644
index d77e7ba..0000000
---
a/ambari-agent/src/test/python/resource_management/TestListAmbariManagedRepos.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-
-'''
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-from mock.mock import patch
-from mock.mock import MagicMock
-from mock.mock import patch, MagicMock
-import glob
-from ambari_commons.os_check import OSCheck
-from resource_management.libraries.functions.list_ambari_managed_repos import *
-from resource_management.core.exceptions import Fail
-from unittest import TestCase
-
-
-class TestListAmbariManagedRepos(TestCase):
-
- @patch("glob.glob")
- @patch.object(OSCheck, "is_ubuntu_family")
- @patch.object(OSCheck, "is_redhat_family")
- @patch.object(OSCheck, "is_suse_family")
- def test_normal_flow_ubuntu(self, is_suse_family_mock,
- is_redhat_family_mock, is_ubuntu_family_mock,
glob_mock):
- is_ubuntu_family_mock.return_value = True
- is_redhat_family_mock.return_value = False
- is_suse_family_mock.return_value = False
- glob_mock.side_effect = \
- [
- [
- "/etc/apt/sources.list.d/HDP-1.1.1.repo",
- "/etc/apt/sources.list.d/HDP-1.1.2.repo",
- "/etc/apt/sources.list.d/HDP-1.1.3.repo",
- "/etc/apt/sources.list.d/HDP-UTILS-1.1.3.repo",
- ],
- [
- "/etc/apt/sources.list.d/HDP-UTILS-1.1.3.repo",
- ],
- []
- ]
- res = list_ambari_managed_repos('HDP')
- self.assertEquals(glob_mock.call_args_list[0][0][0],
"/etc/apt/sources.list.d/HDP*")
- self.assertEquals(res, ['HDP-1.1.1', 'HDP-1.1.2', 'HDP-1.1.3',
'HDP-UTILS-1.1.3'])
- self.assertTrue(glob_mock.call_count > 1)
-
- @patch("glob.glob")
- @patch.object(OSCheck, "is_ubuntu_family")
- @patch.object(OSCheck, "is_redhat_family")
- @patch.object(OSCheck, "is_suse_family")
- def test_normal_flow_rhel(self, is_suse_family_mock,
- is_redhat_family_mock, is_ubuntu_family_mock,
glob_mock):
- is_ubuntu_family_mock.return_value = False
- is_redhat_family_mock.return_value = True
- is_suse_family_mock.return_value = False
- glob_mock.side_effect = \
- [
- [
- "/etc/yum.repos.d/HDP-1.1.1.repo",
- "/etc/yum.repos.d/HDP-1.1.2.repo",
- "/etc/yum.repos.d/HDP-1.1.3.repo",
- "/etc/yum.repos.d/HDP-UTILS-1.1.3.repo",
- ],
- [
- "/etc/yum.repos.d/HDP-UTILS-1.1.3.repo",
- ],
- []
- ]
- res = list_ambari_managed_repos('HDP')
- self.assertEquals(glob_mock.call_args_list[0][0][0],
"/etc/yum.repos.d/HDP*")
- self.assertEquals(res, ['HDP-1.1.1', 'HDP-1.1.2', 'HDP-1.1.3',
'HDP-UTILS-1.1.3'])
- self.assertTrue(glob_mock.call_count > 1)
-
-
- @patch("glob.glob")
- @patch.object(OSCheck, "is_ubuntu_family")
- @patch.object(OSCheck, "is_redhat_family")
- @patch.object(OSCheck, "is_suse_family")
- def test_normal_flow_sles(self, is_suse_family_mock,
- is_redhat_family_mock, is_ubuntu_family_mock,
glob_mock):
- is_ubuntu_family_mock.return_value = False
- is_redhat_family_mock.return_value = False
- is_suse_family_mock.return_value = True
- glob_mock.side_effect = \
- [
- [
- "/etc/zypp/repos.d/HDP-1.1.1.repo",
- "/etc/zypp/repos.d/HDP-1.1.2.repo",
- "/etc/zypp/repos.d/HDP-1.1.3.repo",
- "/etc/zypp/repos.d/HDP-UTILS-1.1.3.repo",
- ],
- [
- "/etc/zypp/repos.d/HDP-UTILS-1.1.3.repo",
- ],
- []
- ]
- res = list_ambari_managed_repos('HDP')
- self.assertEquals(glob_mock.call_args_list[0][0][0],
"/etc/zypp/repos.d/HDP*")
- self.assertEquals(res, ['HDP-1.1.1', 'HDP-1.1.2', 'HDP-1.1.3',
'HDP-UTILS-1.1.3'])
- self.assertTrue(glob_mock.call_count > 1)
-
-
- @patch.object(OSCheck, "is_ubuntu_family")
- @patch.object(OSCheck, "is_redhat_family")
- @patch.object(OSCheck, "is_suse_family")
- def test_normal_flow_unknown_os(self, is_suse_family_mock,
- is_redhat_family_mock, is_ubuntu_family_mock):
- is_ubuntu_family_mock.return_value = False
- is_redhat_family_mock.return_value = False
- is_suse_family_mock.return_value = False
- try:
- list_ambari_managed_repos('HDP')
- self.fail("Should throw a Fail")
- except Fail:
- pass # Expected
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/list_ambari_managed_repos.py
b/ambari-common/src/main/python/resource_management/libraries/functions/list_ambari_managed_repos.py
deleted file mode 100644
index dce6065..0000000
---
a/ambari-common/src/main/python/resource_management/libraries/functions/list_ambari_managed_repos.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Ambari Agent
-
-"""
-
-__all__ = ["list_ambari_managed_repos"]
-import os
-import glob
-from ambari_commons.os_check import OSCheck
-from resource_management.core.exceptions import Fail
-
-
-def list_ambari_managed_repos(stack_name):
- """
- Lists all repositories that are present at host
- """
- stack_name = stack_name.upper()
- # TODO : get it dynamically from the server
- repository_names = [stack_name, stack_name + "-UTILS" ]
- if OSCheck.is_ubuntu_family():
- repo_dir = '/etc/apt/sources.list.d/'
- elif OSCheck.is_redhat_family(): # Centos/RHEL 5/6
- repo_dir = '/etc/yum.repos.d/'
- elif OSCheck.is_suse_family():
- repo_dir = '/etc/zypp/repos.d/'
- else:
- raise Fail('Can not dermine repo dir')
- repos = []
- for name in repository_names:
- # List all files that match pattern
- files = glob.glob(os.path.join(repo_dir, name) + '*')
- for f in files:
- filename = os.path.basename(f)
- # leave out extension
- reponame = os.path.splitext(filename)[0]
- repos.append(reponame)
- # get uniq strings
- seen = set()
- uniq = [s for s in repos if not (s in seen or seen.add(s))]
- return uniq
diff --git
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index 018d561..d373bff 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -81,7 +81,6 @@ class TestInstallPackages(RMFTestCase):
self.assertEquals("3.1.0.0-54", expected_version)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -94,7 +93,7 @@ class TestInstallPackages(RMFTestCase):
read_actual_version_from_history_file_mock,
stack_versions_mock,
put_structured_out_mock,
- get_provider, list_ambari_managed_repos_mock):
+ get_provider):
stack_versions_mock.side_effect = [
[], # before installation attempt
[VERSION_STUB]
@@ -116,7 +115,6 @@ class TestInstallPackages(RMFTestCase):
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
repo_file_name = 'ambari-hdp-1'
use_repos = { 'HDP-UTILS-1.1.0.20': repo_file_name, 'HDP-2.2':
repo_file_name }
self.executeScript("scripts/install_packages.py",
@@ -205,7 +203,6 @@ class TestInstallPackages(RMFTestCase):
self.assertNoMoreResources()
@patch("ambari_commons.os_check.OSCheck.is_suse_family")
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -215,7 +212,7 @@ class TestInstallPackages(RMFTestCase):
def test_normal_flow_sles(self, subprocess_with_timeout,
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock, put_structured_out_mock,
- get_provider, list_ambari_managed_repos_mock,
is_suse_family_mock):
+ get_provider, is_suse_family_mock):
is_suse_family_mock = True
Script.stack_version_from_distro_select = VERSION_STUB
stack_versions_mock.side_effect = [
@@ -239,7 +236,6 @@ class TestInstallPackages(RMFTestCase):
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value=[]
repo_file_name = 'ambari-hdp-1'
use_repos = { 'HDP-UTILS-1.1.0.20': repo_file_name, 'HDP-2.2':
repo_file_name }
self.executeScript("scripts/install_packages.py",
@@ -275,7 +271,6 @@ class TestInstallPackages(RMFTestCase):
)
self.assertNoMoreResources()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.os_check.OSCheck.is_redhat_family")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@@ -287,7 +282,7 @@ class TestInstallPackages(RMFTestCase):
read_actual_version_from_history_file_mock,
stack_versions_mock,
get_provider, put_structured_out_mock,
- is_redhat_family_mock,
list_ambari_managed_repos_mock):
+ is_redhat_family_mock):
stack_versions_mock.side_effect = [
[], # before installation attempt
[VERSION_STUB]
@@ -309,7 +304,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value=["HDP-UTILS-2.2.0.1-885"]
is_redhat_family_mock.return_value = True
repo_file_name = 'ambari-hdp-1'
use_repos = { 'HDP-UTILS-1.1.0.20': repo_file_name, 'HDP-2.2':
repo_file_name }
@@ -371,14 +365,13 @@ class TestInstallPackages(RMFTestCase):
TestInstallPackages._install_failed = True
raise Exception()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.os_check.OSCheck.is_redhat_family")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.core.resources.packaging.Package.__new__")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("ambari_commons.shell.launch_subprocess")
def test_fail(self, subprocess_with_timeout, put_structured_out_mock,
Package__mock, get_provider,
- is_redhat_family_mock, list_ambari_managed_repos_mock):
+ is_redhat_family_mock):
from ambari_commons.os_check import OSConst
from ambari_commons.repo_manager import ManagerFactory
@@ -394,7 +387,6 @@ class TestInstallPackages(RMFTestCase):
get_provider.return_value = pkg_manager
is_redhat_family_mock.return_value = True
- list_ambari_managed_repos_mock.return_value = []
def side_effect(retcode):
TestInstallPackages._install_failed = True
@@ -586,7 +578,6 @@ class TestInstallPackages(RMFTestCase):
)
self.assertNoMoreResources()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -597,7 +588,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
stack_versions_mock.side_effect = [
[OLD_VERSION_STUB], # before installation attempt
[OLD_VERSION_STUB, VERSION_STUB]
@@ -625,7 +616,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -661,7 +651,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -678,7 +667,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -692,7 +680,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
exists_mock.return_value = True
stack_versions_mock.side_effect = [
[], # before installation attempt
@@ -723,7 +711,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
try:
self.executeScript("scripts/install_packages.py",
@@ -751,7 +738,6 @@ class TestInstallPackages(RMFTestCase):
put_structured_out_mock.reset_mock()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -765,7 +751,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
exists_mock.return_value = False
stack_versions_mock.side_effect = [
[], # before installation attempt
@@ -796,7 +782,6 @@ class TestInstallPackages(RMFTestCase):
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
try:
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
@@ -837,7 +822,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
try:
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
@@ -859,7 +843,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -871,7 +854,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
stack_versions_mock.side_effect = [
[OLD_VERSION_STUB], # before installation attempt
[OLD_VERSION_STUB, VERSION_STUB]
@@ -899,7 +882,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -935,7 +917,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -952,7 +933,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -964,7 +944,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
stack_versions_mock.side_effect = [
[OLD_VERSION_STUB], # before installation attempt
[OLD_VERSION_STUB, VERSION_STUB]
@@ -992,7 +972,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -1028,7 +1007,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -1045,7 +1023,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -1059,7 +1036,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-
put_structured_out_mock, get_provider, list_ambari_managed_repos_mock):
+
put_structured_out_mock, get_provider):
exists_mock.return_value = False
stack_versions_mock.side_effect = [
[], # before installation attempt
@@ -1089,7 +1066,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
try:
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
@@ -1130,7 +1106,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
try:
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
@@ -1151,7 +1126,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -1163,7 +1137,7 @@ class TestInstallPackages(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
- put_structured_out_mock,
get_provider, list_ambari_managed_repos_mock):
+ put_structured_out_mock,
get_provider):
stack_versions_mock.side_effect = [
[OLD_VERSION_STUB], # before installation attempt
[OLD_VERSION_STUB, VERSION_STUB]
@@ -1192,7 +1166,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -1229,7 +1202,6 @@ class TestInstallPackages(RMFTestCase):
all_packages.side_effect = TestInstallPackages._add_packages_available
available_packages.side_effect =
TestInstallPackages._add_packages_available
installed_packages.side_effect =
TestInstallPackages._add_packages_available
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
command="actionexecute",
@@ -1245,7 +1217,6 @@ class TestInstallPackages(RMFTestCase):
self.assertFalse(write_actual_version_to_history_file_mock.called)
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -1258,8 +1229,7 @@ class TestInstallPackages(RMFTestCase):
read_actual_version_from_history_file_mock,
stack_versions_mock,
put_structured_out_mock,
- get_provider,
- list_ambari_managed_repos_mock):
+ get_provider):
stack_versions_mock.side_effect = [
[], # before installation attempt
[VERSION_STUB]
@@ -1281,7 +1251,6 @@ class TestInstallPackages(RMFTestCase):
check_existence.return_value = False
get_provider.return_value = pkg_manager
- list_ambari_managed_repos_mock.return_value=[]
repo_file_name = 'ambari-hdp-4'
use_repos = { 'HDP-UTILS-1.1.0.20-repo-4': repo_file_name,
'HDP-2.2-repo-4': repo_file_name }
self.executeScript("scripts/install_packages.py",
diff --git
a/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
b/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
index ed3dfad..73db1d0 100644
--- a/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
+++ b/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
@@ -40,7 +40,6 @@ class TestRemoveStackVersion(RMFTestCase):
["hdp-select2_1_0_1_885", "2.0", "repo2"]
]
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -52,12 +51,11 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
- put_structured_out_mock, get_provider_mock,
list_ambari_managed_repos_mock):
+ put_structured_out_mock, get_provider_mock):
m = MagicMock()
m.all_installed_packages.side_effect = TestRemoveStackVersion._add_packages
get_provider_mock.return_value = m
stack_versions_mock.return_value = [VERSION_STUB, OLD_VERSION_STUB]
- list_ambari_managed_repos_mock.return_value = []
self.executeScript("scripts/remove_previous_stacks.py",
classname="RemovePreviousStacks",
@@ -79,7 +77,6 @@ class TestRemoveStackVersion(RMFTestCase):
)
self.assertNoMoreResources()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -91,7 +88,7 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
- put_structured_out_mock, get_provider_mock,
list_ambari_managed_repos_mock ):
+ put_structured_out_mock, get_provider_mock):
stack_versions_mock.return_value = [VERSION_STUB]
@@ -99,8 +96,6 @@ class TestRemoveStackVersion(RMFTestCase):
m.all_installed_packages.side_effect = TestRemoveStackVersion._add_packages
get_provider_mock.return_value = m
- list_ambari_managed_repos_mock.return_value = []
-
self.executeScript("scripts/remove_previous_stacks.py",
classname="RemovePreviousStacks",
command="actionexecute",
@@ -112,7 +107,6 @@ class TestRemoveStackVersion(RMFTestCase):
self.assertEquals(stack_versions_mock.call_args[0][0], '/usr/hdp')
self.assertNoMoreResources()
-
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
@patch("ambari_commons.repo_manager.ManagerFactory.get")
@patch("resource_management.libraries.script.Script.put_structured_out")
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
@@ -124,7 +118,7 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
- put_structured_out_mock, get_provider_mock,
list_ambari_managed_repos_mock, ):
+ put_structured_out_mock, get_provider_mock):
stack_versions_mock.return_value = [VERSION_STUB, OLD_VERSION_STUB]
@@ -132,8 +126,6 @@ class TestRemoveStackVersion(RMFTestCase):
m.all_installed_packages.side_effect = TestRemoveStackVersion._add_packages
get_provider_mock.return_value = m
- list_ambari_managed_repos_mock.return_value = []
-
try:
self.executeScript("scripts/remove_previous_stacks.py",
classname="RemovePreviousStacks",
