Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 281C7200D08 for ; Tue, 22 Aug 2017 13:47:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F1830166C55; Tue, 22 Aug 2017 11:47:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4F97C166C47 for ; Tue, 22 Aug 2017 13:47:34 +0200 (CEST) Received: (qmail 52979 invoked by uid 500); 22 Aug 2017 11:47:33 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 52263 invoked by uid 99); 22 Aug 2017 11:47:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2017 11:47:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 331C0F555E; Tue, 22 Aug 2017 11:47:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lpuskas@apache.org To: commits@ambari.apache.org Date: Tue, 22 Aug 2017 11:47:34 -0000 Message-Id: <1eb696c22e104f41ac394ac4300de10f@git.apache.org> In-Reply-To: <69ba2ab3390747f5a40ef2186d8d0fb1@git.apache.org> References: <69ba2ab3390747f5a40ef2186d8d0fb1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/51] [abbrv] ambari git commit: AMBARI-21713 Python tests started under uid=0 and uid > 0 works differently, ut fix (dgriennko) archived-at: Tue, 22 Aug 2017 11:47:35 -0000 AMBARI-21713 Python tests started under uid=0 and uid > 0 works differently, ut fix (dgriennko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc8dd78e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc8dd78e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc8dd78e Branch: refs/heads/feature-branch-AMBARI-21307 Commit: fc8dd78e145c45db1128b49f66be5aa1919b852f Parents: 5c78bd7 Author: Dmytro Grinenko Authored: Wed Aug 16 14:34:29 2017 +0300 Committer: Dmytro Grinenko Committed: Wed Aug 16 14:34:29 2017 +0300 ---------------------------------------------------------------------- .../test/python/resource_management/TestPackagesAnalyzer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fc8dd78e/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py index e02e442..a43abaf 100644 --- a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py +++ b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py @@ -26,19 +26,19 @@ class TestPackagesAnalyzer(TestCase): @patch.object(OSCheck, "is_ubuntu_family") def test_get_installed_package_version_ubuntu(self, is_ubuntu_family_mock, checked_call_mock): is_ubuntu_family_mock.return_value = True - checked_call_mock.return_value = (0, '1.2.3','') + checked_call_mock.return_value = (0, '1.2.3') result = packages_analyzer.getInstalledPackageVersion("package1") self.assertEqual(result, '1.2.3') - self.assertEqual(checked_call_mock.call_args_list, [call("dpkg -s package1 | grep Version | awk '{print $2}'", stderr=-1)]) + self.assertEqual(checked_call_mock.call_args_list, [call("dpkg -s package1 | grep Version | awk '{print $2}'")]) @patch("resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call") @patch.object(OSCheck, "is_ubuntu_family") def test_get_installed_package_version_centos_suse(self, is_ubuntu_family_mock, checked_call_mock): is_ubuntu_family_mock.return_value = False - checked_call_mock.return_value = (0, '0.0.1-SNAPSHOT','') + checked_call_mock.return_value = (0, '0.0.1-SNAPSHOT') result = packages_analyzer.getInstalledPackageVersion("package1") self.assertEqual(result, '0.0.1-SNAPSHOT') - self.assertEqual(checked_call_mock.call_args_list, [call("rpm -q --queryformat '%{version}-%{release}' package1 | sed -e 's/\\.el[0-9]//g'", stderr=-1)]) + self.assertEqual(checked_call_mock.call_args_list, [call("rpm -q --queryformat '%{version}-%{release}' package1 | sed -e 's/\\.el[0-9]//g'")]) @patch("resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call") @patch.object(OSCheck, "is_in_family")