checklogs: add count patterns option (#51)

* checklogs: count occurrences of each expr

* checklogs: fix no cnt case

Author: dariusstefan

docs/tasks.md

@@ -110,7 +110,9 @@ may contain the following nodes (as explained [here](https://docker-py.readthedo
 when a check fails, the task is considered failed; this node can either be a
 list of strings, meaning that all of them should be found, or a dictionary with
 the following nodes:
-  * `all`: a list of strings that should be found in the logs
+  * `all`: a list of strings that should be found in the logs or a list of
+dictionaries with two keys: `expr`, for the string, and `cnt`, to specify how many
+time it appears; you can skip `cnt`;
   * `none`: a list of strings that should not be found in the logs
 * `volumes`: either a list of volumes that should be mounted in the container, or a
 dictionary of volumes, each with the following nodes:
@@ -215,6 +217,22 @@ tasks:
       all: regex1 regex2 regex3 regex4 regex5
 ```
 
+If you want to control the number of each pattern:
+
+```
+tasks:
+  - name: MySQL
+    type: mysql
+    ...
+    checklogs:
+      all:
+        - expr: regex1
+          cnt: 2
+        - expr: regex2
+          cnt: 1
+```
+
+
 Mounting an external volume in the container:
 
 ```

sipssert/task.py

@@ -336,18 +336,48 @@ def get_checklogs(self):
             return {"all": [], "none": []}
 
     def check_logs(self):
+        logs = self.container.logs().decode("UTF-8")
         self.log.info(self.checklogs)
-        for regex in self.checklogs["all"]:
+        for rule in self.checklogs["all"]:
             try:
-                if not re.search(regex, self.container.logs().decode('UTF-8')):
-                    self.log.error(f"logs check failed for {regex}; should match")
-                    return False
+                if isinstance(rule, dict):
+                    pattern = rule.get("expr", "")
+                    expected = rule.get("cnt", None)
+
+                    if not pattern:
+                        self.log.error("logs check: empty pattern in rule")
+                        return False
+
+                    matches = re.findall(pattern, logs)
+                    count = len(matches)
+
+                    if expected is not None and count != expected:
+                        self.log.error(
+                            f"logs check failed for {pattern}; "
+                            f"expected {expected} matches, got {count}"
+                        )
+                        return False
+                    elif expected is None and count == 0:
+                        self.log.error(
+                            f"logs check failed for {pattern}; should match"
+                        )
+                        return False
+                else:
+                    pattern = rule
+                    if not re.search(pattern, logs):
+                        self.log.error(
+                            f"logs check failed for {pattern}; should match"
+                        )
+                        return False
+
             except Exception as e:
                 self.log.error(f"error while checking logs: {e}")
                 return False
+
+
         for regex in self.checklogs["none"]:
             try:
-                if re.search(regex, self.container.logs().decode('UTF-8')):
+                if re.search(regex, logs):
                     self.log.error(f"logs check failed for {regex}; shouldn't match")
                     return False
             except Exception as e: