summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Safranek <jsafrane@redhat.com>2014-04-18 14:59:08 +0200
committerJan Safranek <jsafrane@redhat.com>2014-04-18 14:59:08 +0200
commitf37b77a6ae3b4eca619158503135790ebfd84fcd (patch)
treeeed8fcb407a32e5f99bfd1604ca1ec5eac77a5d9
parent91a9c755e9c95fccc08bf915ba7f196700c82923 (diff)
downloadopenlmi-providers-f37b77a6ae3b4eca619158503135790ebfd84fcd.tar.gz
openlmi-providers-f37b77a6ae3b4eca619158503135790ebfd84fcd.tar.xz
openlmi-providers-f37b77a6ae3b4eca619158503135790ebfd84fcd.zip
Use proper paths for various tools.
-rw-r--r--src/software/test/package.py6
-rw-r--r--src/software/test/reposetup.py6
-rw-r--r--src/software/test/test_software_identity_file_check.py2
-rw-r--r--src/software/test/util.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/software/test/package.py b/src/software/test/package.py
index f47eec7..28a49b0 100644
--- a/src/software/test/package.py
+++ b/src/software/test/package.py
@@ -106,7 +106,7 @@ class Package(object):
:returns: Package summary string.
"""
return util.check_output(
- ['/usr/bin/rpm', '-q', '--qf', '%{SUMMARY}', '-p',
+ ['/bin/rpm', '-q', '--qf', '%{SUMMARY}', '-p',
self.rpm_path])
def get_nevra(self, with_epoch='NOT_ZERO'):
@@ -175,7 +175,7 @@ def is_pkg_installed(pkg):
if not isinstance(pkg, Package):
return subprocess.call(["rpm", "--quiet", "-q", pkg]) == 0
else:
- cmd = ["/usr/bin/rpm", "-q", "--qf", "%{EPOCH}:%{NVRA}\n", pkg.nevra]
+ cmd = ["/bin/rpm", "-q", "--qf", "%{EPOCH}:%{NVRA}\n", pkg.nevra]
try:
out = util.check_output(cmd).splitlines()[0]
epoch, _ = out.split(':')
@@ -210,7 +210,7 @@ def filter_installed_packages(pkgs, installed=True):
elif not installed:
raise TypeError("packages must be objects of Package")
pkg_strings.append(pkg)
- cmd = [ "/usr/bin/rpm", "-q", "--qf"
+ cmd = [ "/bin/rpm", "-q", "--qf"
, "%{NAME}-%{EPOCH}:%{VERSION}-%{RELEASE}.%{ARCH}\n"]
cmd.extend(pkg_strings)
process = subprocess.Popen(cmd,
diff --git a/src/software/test/reposetup.py b/src/software/test/reposetup.py
index c67514d..c844337 100644
--- a/src/software/test/reposetup.py
+++ b/src/software/test/reposetup.py
@@ -419,7 +419,7 @@ def _make_source_tarball(rpmbuild_dir, pkg_nevra, pkg_dict):
src_dir = os.path.join(archive_dir,
'%s-%s' % (match.group('name'), match.group('ver')))
_write_package_directory(src_dir, pkg_dict.get('files', {}))
- subprocess.call(['/usr/bin/tar', '-C', archive_dir,
+ subprocess.call(['/bin/tar', '-C', archive_dir,
'-czf', tarball_path, os.path.basename(src_dir)])
return tarball_path
finally:
@@ -470,7 +470,7 @@ def _get_rpm_name_from_spec(spec_file_path):
:returns: Name of rpm file builded out of particular spec file.
:rtype: string
"""
- return util.check_output(['/usr/bin/rpm', '-q', '--specfile',
+ return util.check_output(['/bin/rpm', '-q', '--specfile',
spec_file_path]).splitlines()[0] + '.rpm'
def _build_pkg(rpmbuild_dir, pkg_nevra, pkg_dict):
@@ -570,7 +570,7 @@ def get_yum_config():
yumvar_dict = yum.YumBase().conf.yumvar
kwargs = dict((f, yumvar_dict[f]) for f in YumVars._fields if f in yumvar_dict)
kwargs['disttag'] = '.' + util.check_output(
- ['/usr/bin/rpm', '-q', '--qf', '%{RELEASE}\n'
+ ['/bin/rpm', '-q', '--qf', '%{RELEASE}\n'
, 'kernel']).splitlines()[0].split('.')[-1]
get_yum_config._yum_vars = YumVars(**kwargs)
return get_yum_config._yum_vars
diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py
index dd83b71..9b57b1f 100644
--- a/src/software/test/test_software_identity_file_check.py
+++ b/src/software/test/test_software_identity_file_check.py
@@ -369,7 +369,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
% (pkg.name, filepath))
os.remove(filepath)
- subprocess.call(['/usr/bin/mknod', filepath, 'b' if is_block else 'c',
+ subprocess.call(['/bin/mknod', filepath, 'b' if is_block else 'c',
str(os.major(stats.st_rdev) + 1), str(os.minor(stats.st_rdev) + 1)])
os.chmod(filepath, 0644)
self.assertTrue(os.path.exists(filepath))
diff --git a/src/software/test/util.py b/src/software/test/util.py
index adac5ea..fbee188 100644
--- a/src/software/test/util.py
+++ b/src/software/test/util.py
@@ -162,7 +162,7 @@ def get_installed_packages():
:returns: list of packages in format: ``NAME-EPOCH:VERSION-RELEASE.ARCH``
"""
output = check_output(
- [ "/usr/bin/rpm", "-qa", "--qf"
+ [ "/bin/rpm", "-qa", "--qf"
, "%{NAME}-%{EPOCH}:%{VERSION}-%{RELEASE}.%{ARCH}\n"],
stderr=DEV_NULL).split()
package_list = []