X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=633fde23f108e137325fbe8a89d6b35430fb99b9;hb=ade1c0ef24875e9b6696dadd271d778752f643b8;hp=738dd7743a3a5e1c4cae7b42d2ac52f02fe25cf0;hpb=f9d796dbbb93a1124e8f5ee4b47726575d561938;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 738dd77..633fde2 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -245,7 +245,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 = utils.system("curl --silent {}/ | grep -q sfa-".format(rpms_url)) == 0 + retcod = utils.system("curl --silent {}/ | grep -q sfa-4".format(rpms_url)) == 0 encoded = 'yes' if retcod else 'no' with open(has_sfa_cache_filename,'w') as cache: cache.write(encoded) @@ -359,7 +359,7 @@ class TestPlc: return self.dnf_check_installed(rpms) def pip3_install(self, package): - return self.run_in_guest("pip3 install {}".format(package)) == 0 + return self.run_in_guest(f"pip3 install {package} || pip install {package}") == 0 def auth_root(self): return {'Username' : self.plc_spec['settings']['PLC_ROOT_USER'],