Conflicts resolved with rel-v6r21

Author: atsareg

WorkloadManagementSystem/DB/JobDB.py

@@ -127,6 +127,9 @@ def getAttributesForJobList(self, jobIDList, attrList=None):
     if not jobIDList:
       return S_OK({})
     if attrList:
+      missingAttr = [repr(x) for x in attrList if x not in self.jobAttributeNames]
+      if missingAttr:
+        return S_ERROR("JobDB.getAttributesForJobList: Unknown Attribute(s): %s" % ", ".join(missingAttr))
       attrNames = ','.join(str(x) for x in attrList if x in self.jobAttributeNames)
       attr_tmp_list = attrList
     else:

codecov.yml

@@ -1,12 +1,5 @@
 comment: off
 
-coverage:
-  status:
-    project:
-      default: off
-      unittest:
-        flags: unittest
-
 flags:
   # filter the folder(s) you wish to measure by that flag
   unittest:
@@ -25,3 +18,19 @@ flags:
       - DIRAC/TransformationSystem
       - DIRAC/Workflow
       - DIRAC/WorkloadManagementSystem
+
+ignore:
+  - ".*/[Tt]ests/.*"
+  - ".*/[Tt]est/.*"
+  - "^docs"
+  - "^container"
+  - "^tests"
+
+coverage:
+  status:
+    project:
+      default:
+        threshold: 0.03
+    patch:
+      default:
+        target: 0

release.notes

@@ -63,6 +63,12 @@ FIX: (#4119) Not lhcb but dteam (for DIRAC certification)
 FIX: (#4139) client_dms.sh not lhcb specific
 CHANGE:(#4140) adapt transformation certification tests to dteam VO
 
+[v6r21p12]
+
+*WMS
+FIX: (#4155) JobDB.getAttributesForJobList: Return S_ERROR if unknown attributes are requested. 
+     Instead of potentially returning garbage a clear error message is returned.
+
 [v6r21p11]
 
 *Transformation