From b82e960cbacab00879a677aef1a79ab4b7947501 Mon Sep 17 00:00:00 2001
From: Mathieu Courtois <mathieu.courtois@edf.fr>
Date: Thu, 22 Nov 2018 17:53:56 +0100
Subject: [PATCH] [#28192] Adapt DEBUT/POURSUITE checking for asterxx branch.
--HG--
branch : edf/mc
---
lib/aslint/test/test_checkers.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/aslint/test/test_checkers.py b/lib/aslint/test/test_checkers.py
index 723b244a..f0035855 100644
--- a/lib/aslint/test/test_checkers.py
+++ b/lib/aslint/test/test_checkers.py
@@ -111,13 +111,13 @@ class InvalidFilenameXX(FilenameCat, TextMsgNotFound):
# - mac3c needs the '3'
# accept aaaaNNNm + a suffix starting with '_'
# accept 'xx*'
- _expr1 = re.compile(r"/(?P<root>[a-z3]{3,5}[0-9]{2,3}[a-z]{1})"
+ _expr1 = re.compile(r"/(?P<root>[a-z3]{3,16}[0-9]{2,3}[a-z]{1})"
r"(?P<ext>\.(" + "|".join(REG_EXT) + "))$")
- _expr2 = re.compile(r"/(?P<root>[a-z3]{3,5}[0-9]{2,3}[a-z]{1}"
+ _expr2 = re.compile(r"/(?P<root>[a-z3]{3,16}[0-9]{2,3}[a-z]{1}"
r"_\w{1,16})"
r"(?P<ext>\.(comm|py))$")
_expr3 = re.compile(r"/(?P<root>xx\w+)"
- r"(?P<ext>(|\.(export|py)))$")
+ r"(?P<ext>(|\.(" + "|".join(REG_EXT) + ")))$")
_expr4 = re.compile(r"/(?P<root>[0-9]+)"
r"(?P<ext>\.med)$")
found = (_expr1.findall(txt) or
@@ -547,6 +547,8 @@ class RequiredKeyword(FileContentCat, GenericMsg):
elif self._pours.search(txt):
if not self._poucod.search(txt):
err.append(": %s not found in POURSUITE" % self._pouerr)
+ elif "asterxx" in self.ctxt.branch:
+ pass
else:
err.append(": neither DEBUT or POURSUITE found")
return err
--
GitLab