From 525da0a32dffa226296e59a32bd42bcb1c44214b Mon Sep 17 00:00:00 2001 From: Konstantin Boudnik Date: Fri, 31 Jan 2014 15:13:32 -0800 Subject: BIGTOP-1197. iTest PackageManagerTests are failing --- .../org/apache/bigtop/itest/pmanager/RPMPackage.groovy | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy') diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy index b95d1aa2..080cf670 100644 --- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy +++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy @@ -93,8 +93,20 @@ Description: %{DESCRIPTION} public Map getServices() { Map res = [:]; - String transform = (mgr.getType() == "zypper") ? "sed -ne '/^.etc.rc.d./s#^.etc.rc.d.##p'" : - "sed -ne '/^.etc.rc.d.init.d./s#^.etc.rc.d.init.d.##p'"; + String transform; + + switch (mgr.getType()) { + case "zypper": + transform = "sed -ne '/^.etc.rc.d./s#^.etc.rc.d.##p'" + break + case "yum": + transform = "sed -ne '/^.usr.sbin./s#^.usr.sbin.##p'" + break + default: + transform = "sed -ne '/^.etc.rc.d.init.d./s#^.etc.rc.d.init.d.##p'" + break + } + shUser.exec("rpm -ql $name | $transform").out.collect { res[it] = new Service(it); } -- cgit v1.2.3