epic-ukulele

diff --git a/TestXfhem/FitnessePages/AaaPrepare/.dummy b/TestXfhem/FitnessePages/AaaPrepare/.dummy
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/TestXfhem/FitnessePages/TestWatchdog/content.txt b/TestXfhem/FitnessePages/TestWatchdog/content.txt
index 2ce2b4b60d1f2a9a077f5b9d9715d0dc647833eb..564c8c38fd40af8f4585f126788bf4f8b3daa639 100644 (file)
--- 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|
 
 !|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
 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
 
 Warte Auslösezeit

-|call script|sleep 60|
+|call script|sleep 6|

 
 Prüfe Watchdog
 
 Prüfe Watchdog

+|call script|grep rwd /tmp/sysal-stub.out|

 
 Entferne Watchdog
 |call script|xfhem delete watchdog|
 
 Entferne Watchdog
 |call script|xfhem delete watchdog|

+

diff --git a/TestXfhem/FitnessePages/properties.xml b/TestXfhem/FitnessePages/properties.xml
index 72aa2b6a6b765c0099b15f3ec783a5d55c82acea..3096ff6ba20492a649159f111c00e4053dc85e4e 100644 (file)
--- a/TestXfhem/FitnessePages/properties.xml
+++ b/TestXfhem/FitnessePages/properties.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <properties>
 <?xml version="1.0"?>
 <properties>

-       <Edit>true</Edit>
-       <Files>true</Files>
-       <Properties>true</Properties>
-       <RecentChanges>true</RecentChanges>
-       <Refactor>true</Refactor>
-       <Search>true</Search>
-       <Versions>true</Versions>
-       <WhereUsed>true</WhereUsed>
+       <Edit/>
+       <Files/>
+       <Help></Help>
+       <Properties/>
+       <RecentChanges/>
+       <Refactor/>
+       <Search/>
+       <Suite/>
+       <Suites></Suites>
+       <Versions/>
+       <WhereUsed/>

 </properties>
 </properties>

diff --git a/TestXfhem/bin/.dummy b/TestXfhem/bin/.dummy
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/debian/xfhem.control b/debian/xfhem.control
index 6a43d983827c9ce18d76e58b79ba39d3cb807840..6d1e5ffa8133452bc0af5bc2a69ada7b60116459 100644 (file)
--- a/debian/xfhem.control
+++ b/debian/xfhem.control
@@ -6,6 +6,6 @@ Build-Depends: git,build-essential
  
 Package: xfhem
 Architecture: all
  
 Package: xfhem
 Architecture: all

-Depends: fhem
+Depends: fhem,sysal-util

 Description: WagnerTech utilities for FHEM
 
 Description: WagnerTech utilities for FHEM
 

diff --git a/debian/xfhem.postinst b/debian/xfhem.postinst
index fe84a65b8c9ec2aea7d8a070e01247cfd6edf7c0..66f4298782567fb61b08b9823e9f1d3219ac7795 100755 (executable)
--- a/debian/xfhem.postinst
+++ b/debian/xfhem.postinst
@@ -3,7 +3,7 @@ set -e
 
 chown fhem:dialout /opt/fhem/wagnertech.cfg
 
 
 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
 then
        echo >> /opt/fhem/fhem.cfg
        echo "# include from xfhem package" >> /opt/fhem/fhem.cfg