michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: fix skipped testcase status posting

Browse source 
Skipped tests were not evaluated correctly.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-11-20 17:26:12 -05:00
commit ccb57d766b
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/ci/check-compliance.py
View file

@ -132,8 +132,7 @@ class Documentation(ComplianceTest):
self.case.result = Error("Documentation Issues", "failure") self.case.result = Error("Documentation Issues", "failure")
self.case.result._elem.text = log.decode('utf8') self.case.result._elem.text = log.decode('utf8')
else:
self.case.result = Skipped()
class GitLint(ComplianceTest): class GitLint(ComplianceTest):
_name = "Gitlint" _name = "Gitlint"
@ -165,14 +164,13 @@ class License(ComplianceTest):
scancode = "/opt/scancode-toolkit/scancode" scancode = "/opt/scancode-toolkit/scancode"
if not os.path.exists(scancode): if not os.path.exists(scancode):
self.case.result = Skipped() self.case.result = Skipped("scancode-toolkit not installed", "skipped")
return return
os.makedirs("scancode-files", exist_ok=True) os.makedirs("scancode-files", exist_ok=True)
new_files = sh.git("diff", "--name-only", "--diff-filter=A", self.commit_range, **sh_special_args) new_files = sh.git("diff", "--name-only", "--diff-filter=A", self.commit_range, **sh_special_args)
if len(new_files) == 0: if len(new_files) == 0:
self.case.result = Skipped()
return return
for newf in new_files: for newf in new_files:
@ -192,7 +190,7 @@ class License(ComplianceTest):
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logging.error(e.output) logging.error(e.output)
self.case.result = Skipped() self.case.result = Skipped("Exception when running scancode", "skipped")
return return
report = "" report = ""
@ -357,7 +355,7 @@ def main():
comment_count = 0 comment_count = 0
print("Processing results...") print("Processing results...")
for case in suite: for case in suite:
if case.result and case.result != Skipped: if case.result and case.result.type != 'skipped':
comment_count += 1 comment_count += 1
comment += ("## {}\n".format(case.result.message)) comment += ("## {}\n".format(case.result.message))
comment += "\n" comment += "\n"