From d4b17c308460f11a03fde0a2cb4f34ebb8743601 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Tue, 25 Feb 2020 02:57:11 +0100 Subject: [PATCH] epic-ukulele --- TestXfhem/FitnessePages/AaaPrepare/.dummy | 0 .../FitnessePages/TestWatchdog/content.txt | 9 +++++++-- TestXfhem/FitnessePages/properties.xml | 19 +++++++++++-------- TestXfhem/bin/.dummy | 0 debian/xfhem.control | 2 +- debian/xfhem.postinst | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 TestXfhem/FitnessePages/AaaPrepare/.dummy create mode 100644 TestXfhem/bin/.dummy diff --git a/TestXfhem/FitnessePages/AaaPrepare/.dummy b/TestXfhem/FitnessePages/AaaPrepare/.dummy new file mode 100644 index 0000000..e69de29 diff --git a/TestXfhem/FitnessePages/TestWatchdog/content.txt b/TestXfhem/FitnessePages/TestWatchdog/content.txt index 2ce2b4b..564c8c3 100644 --- a/TestXfhem/FitnessePages/TestWatchdog/content.txt +++ b/TestXfhem/FitnessePages/TestWatchdog/content.txt @@ -3,13 +3,18 @@ Install Watchdog !|test.util.CallScript| |call script|xfhem define watchdog localhost| +Entferne Sysal-Stub-Output +|call script|!-sudo rm /tmp/sysal-stub.out || true -!| + Verkürze Zeit -|call script|/opt/fhem/fhem.pl 7072 "modify watchdog +*00:01:00"| +|call script|/opt/fhem/fhem.pl 7072 "modify watchdog +*00:00:05"| Warte Auslösezeit -|call script|sleep 60| +|call script|sleep 6| Prüfe Watchdog +|call script|grep rwd /tmp/sysal-stub.out| Entferne Watchdog |call script|xfhem delete watchdog| + diff --git a/TestXfhem/FitnessePages/properties.xml b/TestXfhem/FitnessePages/properties.xml index 72aa2b6..3096ff6 100644 --- a/TestXfhem/FitnessePages/properties.xml +++ b/TestXfhem/FitnessePages/properties.xml @@ -1,11 +1,14 @@ - true - true - true - true - true - true - true - true + + + + + + + + + + + diff --git a/TestXfhem/bin/.dummy b/TestXfhem/bin/.dummy new file mode 100644 index 0000000..e69de29 diff --git a/debian/xfhem.control b/debian/xfhem.control index 6a43d98..6d1e5ff 100644 --- a/debian/xfhem.control +++ b/debian/xfhem.control @@ -6,6 +6,6 @@ Build-Depends: git,build-essential Package: xfhem Architecture: all -Depends: fhem +Depends: fhem,sysal-util Description: WagnerTech utilities for FHEM diff --git a/debian/xfhem.postinst b/debian/xfhem.postinst index fe84a65..66f4298 100755 --- a/debian/xfhem.postinst +++ b/debian/xfhem.postinst @@ -3,7 +3,7 @@ set -e chown fhem:dialout /opt/fhem/wagnertech.cfg -if ! grep wagnertech.cfg /opt/fhem/fhem.cfg +if ! grep wagnertech.cfg /opt/fhem/fhem.cfg >/dev/null then echo >> /opt/fhem/fhem.cfg echo "# include from xfhem package" >> /opt/fhem/fhem.cfg -- 2.20.1