From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 24 May 2012 08:16:52 +0000 (+0200)
Subject: builds that don't provide SFA need to skip steps in 'sfi' as well
X-Git-Tag: tests-5.1-5~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c73764a6199fdfc2a1991be720da071885f15ea1;p=tests.git

builds that don't provide SFA need to skip steps in 'sfi' as well
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index dcc7dd3..aabfe3e 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -126,15 +126,20 @@ class TestPlc:
         return step != SEP and step != SEPSFA
 
     # turn off the sfa-related steps when build has skipped SFA
-    # this is originally for centos5 as recent SFAs won't build on this platform
+    # this was originally for centos5 but is still valid
+    # for up to f12 as recent SFAs with sqlalchemy won't build before f14
     @staticmethod
     def check_whether_build_has_sfa (rpms_url):
+        utils.header ("Checking if build provides SFA package...")
         # 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:
+        if retcod==0:
+            utils.header("build does provide SFA")
+        else:
             # move all steps containing 'sfa' from default_steps to other_steps
-            sfa_steps= [ step for step in TestPlc.default_steps if step.find('sfa')>=0 ]
+            utils.header("SFA package not found - removing steps with sfa or sfi")
+            sfa_steps= [ step for step in TestPlc.default_steps if step.find('sfa')>=0 or step.find("sfi")>=0 ]
             TestPlc.other_steps += sfa_steps
             for step in sfa_steps: TestPlc.default_steps.remove(step)