summaryrefslogtreecommitdiffstats
path: root/src/software
diff options
context:
space:
mode:
authorMichal Minar <miminar@redhat.com>2013-10-03 13:37:01 +0200
committerMichal Minar <miminar@redhat.com>2013-10-04 09:53:38 +0200
commit05b40dcd5d0e3e52fd899a47f0656afb0f4913c3 (patch)
tree06ecc332d2cfa00369d10bf60047fde81fd7410e /src/software
parent7abb2b8698a55c421c63f48cf6b633d9293fea27 (diff)
downloadopenlmi-providers-05b40dcd5d0e3e52fd899a47f0656afb0f4913c3.tar.gz
openlmi-providers-05b40dcd5d0e3e52fd899a47f0656afb0f4913c3.tar.xz
openlmi-providers-05b40dcd5d0e3e52fd899a47f0656afb0f4913c3.zip
software: url check fix in test
Let's ignore trailing slashes when comparing repository urls.
Diffstat (limited to 'src/software')
-rwxr-xr-xsrc/software/test/test_software_identity_resource.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/software/test/test_software_identity_resource.py b/src/software/test/test_software_identity_resource.py
index 6f642d1..d321523 100755
--- a/src/software/test/test_software_identity_resource.py
+++ b/src/software/test/test_software_identity_resource.py
@@ -81,8 +81,8 @@ class TestSoftwareIdentityResource(
self.assertIsInstance(inst["AccessContext"], pywbem.Uint16)
access_info = inst["AccessInfo"]
- if access_info is not None and access_info.endswith('/'):
- access_info = access_info[:-1]
+ if access_info is not None:
+ access_info = access_info.rstrip('/')
if access_info is not None:
self.assertIsInstance(access_info, basestring)
if repo.mirror_list:
@@ -94,7 +94,7 @@ class TestSoftwareIdentityResource(
"AccessInfo does not match metalink for repo %s" %
repo.repoid)
elif access_info is not None:
- self.assertIn(access_info, repo.base_urls,
+ self.assertIn(access_info, {u.rstrip('/') for u in repo.base_urls},
"AccessInfo missing in base_urls for repo %s" % repo.repoid)
self.assertIsInstance(inst["AvailableRequestedStates"], list)