fix test check for TMPDIR: do not throw exception if variable does not exist

diff --git a/contrib/no_autostart_above_core.conf b/contrib/no_autostart_above_core.conf
index 81c01898f3fb92d552ed578c84a2c8b8b033a1a6..7bcf6c8ae12b618f84f4b3ee88d7f153a0a93c6b 100644 (file)
--- a/contrib/no_autostart_above_core.conf
+++ b/contrib/no_autostart_above_core.conf
@@ -85,3 +85,6 @@ AUTOSTART = NO
 
 [sensor]
 AUTOSTART = NO
+
+[zonemaster-monitor]
+AUTOSTART = NO

diff --git a/contrib/no_forcestart.conf b/contrib/no_forcestart.conf
index e21187ed21d18cb18a155027f73cfdf709a34774..a332d6da7dc7859d32c72ee2427cb7f1721feb0b 100644 (file)
--- a/contrib/no_forcestart.conf
+++ b/contrib/no_forcestart.conf
@@ -35,4 +35,7 @@ FORCESTART = NO
 FORCESTART = NO
 
 [zonemaster]
-FORCESTART = NO
\ No newline at end of file
+FORCESTART = NO
+
+[zonemaster-monitor]
+FORCESTART = NO

diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index 8f6966b6f073ccabcb2377246262783fa086a1f5..96714cf9a88d9ad435822e2047b290884320b035 100644 (file)
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -8,10 +8,10 @@ import subprocess
 import time
 
 if os.name == "nt":
-  tmp = os.getenv ("TEMP")
-elif os.environ["TMPDIR"]:
+    tmp = os.getenv ("TEMP")
+elif None != os.environ.get("TMPDIR"):
     tmp = os.getenv("TMPDIR")
-elif os.environ["TMP"]:
+elif None != os.environ.get("TMP"):
     tmp = os.getenv("TMP")
 else:
     tmp = "/tmp"

diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 66555291cd14dd15b1a19f4d48892751e2ff7089..9ef8d067375db8dd9b786db776459ec41cd958e8 100644 (file)
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -1,5 +1,5 @@
 @INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-statistics/
-