X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=1d1ea45309979ea8290b600a50ffb2918616f958;hb=eeba8e303edbfc5e926767ba22294beda642ecba;hp=8b5018ef33998e994d531bb0bc815e239ced4e56;hpb=8666ae7f0291e8d115e166ef555f02abafc40fc8;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 8b5018e..1d1ea45 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -233,7 +233,7 @@ class TestPlc: # warning, we're now building 'sface' so let's be a bit more picky # full builds are expected to return with 0 here utils.header("Checking if build provides SFA package...") - retcod = os.system("curl --silent {}/ | grep -q sfa-".format(rpms_url)) == 0 + retcod = utils.system("curl --silent {}/ | grep -q sfa-".format(rpms_url)) == 0 encoded = 'yes' if retcod else 'no' with open(has_sfa_cache_filename,'w') as cache: cache.write(encoded) @@ -308,7 +308,7 @@ class TestPlc: def host_to_guest(self, command): vservername = self.vservername personality = self.options.personality - raw = "{personality} virsh -c lxc:/// lxc-enter-namespace {vservername}".format(**locals()) + raw = "{personality} virsh -c lxc:/// lxc-enter-namespace --noseclabel {vservername}".format(**locals()) # f14 still needs some extra help if self.options.fcdistro == 'f14': raw +=" -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin {command}".format(**locals())