From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 25 Sep 2010 13:32:05 +0000 (+0200)
Subject: make 'check_whether_build_has_sfa' more robust, now that we build sface
X-Git-Tag: tests-5.0-16~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=de951a7dfa3109770fc8a9dd51f4e13e866f8988;p=tests.git

make 'check_whether_build_has_sfa' more robust, now that we build sface
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 16e61f7..99542c5 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -127,7 +127,8 @@ class TestPlc:
     # this is originally for centos5 as recent SFAs won't build on this platformb
     @staticmethod
     def check_whether_build_has_sfa (rpms_url):
-        retcod=os.system ("curl --silent %s/ | grep -q sfa"%rpms_url)
+        # warning, we're now building 'sface' so let's be a bit more picky
+        retcod=os.system ("curl --silent %s/ | grep -q sfa-"%rpms_url)
         # full builds are expected to return with 0 here
         if retcod!=0:
             # move all steps containing 'sfa' from default_steps to other_steps