Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
def pytest_configure(config):
config.addinivalue_line("markers", "no_mock_full_hour: mark test to disable full_hour mocking.")
config.addinivalue_line("markers", "no_mock_quarter_hour: mark test to disable quarter_hour mocking.")
import sys
sys._called_from_test = True


def pytest_unconfigure(config):
import sys
del sys._called_from_test


@pytest.fixture(autouse=True)
Expand Down
13 changes: 9 additions & 4 deletions packages/modules/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import dataclass_utils
from helpermodules.pub import Pub
from modules.io_actions.groups import READABLE_GROUP_NAME, ActionGroup
import sys
log = logging.getLogger(__name__)


Expand Down Expand Up @@ -165,8 +166,10 @@ def _pub_configurable_soc_modules() -> None:
"text": dev_defaults.name,
"defaults": dataclass_utils.asdict(dev_defaults)
})
except Exception:
log.exception("Fehler im configuration-Modul")
except Exception as e:
log.exception(f"Fehler {e} im configuration-Modul {path}")
if hasattr(sys, '_called_from_test'):
print(f"Fehler {e} im configuration-Modul {path}")
soc_modules = sorted(soc_modules, key=lambda d: d['text'].upper())
# "leeren" Eintrag an erster Stelle einfügen
soc_modules.insert(0,
Expand All @@ -179,8 +182,10 @@ def _pub_configurable_soc_modules() -> None:
}
})
Pub().pub("openWB/set/system/configurable/soc_modules", soc_modules)
except Exception:
log.exception("Fehler im configuration-Modul")
except Exception as e:
log.exception(f"Fehler {e} im configuration-Modul {path}")
if hasattr(sys, '_called_from_test'):
print(f"Fehler {e} im configuration-Modul {path}")


def _pub_configurable_devices_components() -> None:
Expand Down