Repository: ambari Updated Branches: refs/heads/trunk f9a08f9f8 -> 38cce2177
AMBARI-8476. Run sudo commands as sudo and sudo su ability in Resource Management (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/38cce217 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/38cce217 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/38cce217 Branch: refs/heads/trunk Commit: 38cce21774214cc530112abf9ef70fdb4f3a2a66 Parents: f9a08f9 Author: Andrew Onishuk <[email protected]> Authored: Mon Dec 1 14:41:21 2014 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Mon Dec 1 14:41:21 2014 +0200 ---------------------------------------------------------------------- .../resource_management/TestPackageResource.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/38cce217/ambari-agent/src/test/python/resource_management/TestPackageResource.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestPackageResource.py b/ambari-agent/src/test/python/resource_management/TestPackageResource.py index 95e053f..140dda9 100644 --- a/ambari-agent/src/test/python/resource_management/TestPackageResource.py +++ b/ambari-agent/src/test/python/resource_management/TestPackageResource.py @@ -35,14 +35,12 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package$ | grep -v deinstall"), - call(['/usr/bin/apt-get', '-q', '-o', "Dpkg::Options::='--force-confdef'", '--allow-unauthenticated', '--assume-yes', 'install', 'some-package'], - sudo=True, env={'DEBIAN_FRONTEND': 'noninteractive'}), - call(['/usr/bin/apt-get', 'update', '-qq'], sudo=True) - ]) + call_mock.assert_has_calls([call("dpkg --get-selections | grep -v deinstall | awk '{print $1}' | grep ^some-package$"), + call(['/usr/bin/apt-get', '-q', '-o', 'Dpkg::Options::=--force-confdef', '--allow-unauthenticated', '--assume-yes', 'install', 'some-package'], sudo=True, env={'DEBIAN_FRONTEND': 'noninteractive'}), + call(['/usr/bin/apt-get', 'update', '-qq'], sudo=True)]) - shell_mock.assert_has_calls([call(['/usr/bin/apt-get', '-q', '-o', "Dpkg::Options::='--force-confdef'", '--allow-unauthenticated', '--assume-yes', 'install', - 'some-package'], sudo=True)]) + shell_mock.assert_has_calls([call(['/usr/bin/apt-get', '-q', '-o', 'Dpkg::Options::=--force-confdef', + '--allow-unauthenticated', '--assume-yes', 'install', 'some-package'], sudo=True)]) @patch.object(shell, "call") @patch.object(shell, "checked_call") @@ -52,10 +50,8 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package$ | grep -v deinstall"), - call(['/usr/bin/apt-get', '-q', '-o', "Dpkg::Options::='--force-confdef'", '--allow-unauthenticated', '--assume-yes', 'install', 'some-package'], - sudo=True, env={'DEBIAN_FRONTEND': 'noninteractive'}) - ]) + call_mock.assert_has_calls([call("dpkg --get-selections | grep -v deinstall | awk '{print $1}' | grep ^some-package$"), + call(['/usr/bin/apt-get', '-q', '-o', 'Dpkg::Options::=--force-confdef', '--allow-unauthenticated', '--assume-yes', 'install', 'some-package'], sudo=True, env={'DEBIAN_FRONTEND': 'noninteractive'})]) self.assertEqual(shell_mock.call_count, 0, "shell.checked_call shouldn't be called") @@ -80,7 +76,7 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_called_with('rpm -qa | grep ^some_package') + call_mock.assert_called_with('installed_pkgs=`rpm -qa some_package` ; [ ! -z "$installed_pkgs" ]') shell_mock.assert_called_with(['/usr/bin/zypper', '--quiet', 'install', '--auto-agree-with-licenses', '--no-confirm', 'some_package'], sudo=True) @patch.object(shell, "call", new = MagicMock(return_value=(0, None)))
