diff --git a/papi/config.py b/papi/config.py index 474182a..44d8fb5 100644 --- a/papi/config.py +++ b/papi/config.py @@ -4,6 +4,7 @@ import glob import configparser import logging as logger +from papi.sqlapp import crud def read_config(*, kind=None, pattern="*"): @@ -37,7 +38,7 @@ def read_config(*, kind=None, pattern="*"): gg = dict(conf["relais"]) for k, v in gg.items(): gg[k] = v.strip() - if "'" in v or '"' in v: + if "'" in v or '"' in v: # raise ValueError( f"{k}:{v} from {path} containts forbidden char (escaping issue)" ) diff --git a/papi/mail_sendermodel.py b/papi/mail_sendermodel.py index 8ae6918..3e05f40 100644 --- a/papi/mail_sendermodel.py +++ b/papi/mail_sendermodel.py @@ -21,7 +21,6 @@ def sendmail(htmlpart, emails, textpart="", subject="Monitorig api"): ] } if nomail: - breakpoint() print(data) return result = mailjet.send.create(data=data) diff --git a/papi/main.py b/papi/main.py index 34badb1..c106fbb 100644 --- a/papi/main.py +++ b/papi/main.py @@ -184,9 +184,6 @@ def last_notif_text(request: Request, idsonde: str, db: Session = Depends(get_db try: recipients = sondeid2notifsemails(idsonde) except KeyError: # pragma: no cover - - # breakpoint() - recipients = ["mail1@xxx", "mail2@xxx", f"{idsonde}@fqdn"] changements = content["changes"] diff --git a/papi/relais.py b/papi/relais.py index 1beb62c..9dbd54b 100644 --- a/papi/relais.py +++ b/papi/relais.py @@ -1,11 +1,9 @@ import requests import urllib3 -import sys -from .config import read_config import logging as logger -import json import math import itertools +from . import config https = False diff --git a/tests/test_config.py b/tests/test_config.py index cbe02ed..3f84611 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,5 +1,6 @@ from unittest import TestCase from papi import main +import pytest class ConfigurationTestCase(TestCase): @@ -21,3 +22,17 @@ class ConfigurationTestCase(TestCase): assert config["emails"] == [ "1@1", ] + + def test_cover_raise(self): + with pytest.raises(ValueError) as exc: + configs = main.read_config(kind="relais", pattern="relais_code_test_sonde") + + def test_duplicate_exists_in_db(self): + # donw wth coverage + from papi.main import atomic_db + + configs = main.read_config(pattern="*1mail") + assert len(configs) == 1 + dups = [configs[0], configs[0]] + #breakpoint() + main.apply_config(atomic_db=atomic_db, configs=dups)