Merge branch 'testing' into chfi

1 files changed, 12 insertions, 1 deletions

diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 23d6fb62..90144962 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -113,6 +113,16 @@ def assert_dir(dir):
         raise Exception("ERROR: can not find directory "+dir)
     return dir
 
+def assert_writable_dir(dir):
+    try:
+        fn = dir + "/test.txt"
+        fh = open( fn, 'w' )
+        fh.write("I am writing this text to the file\n")
+        fh.close()
+        os.remove(fn)
+    except IOError:
+        raise Exception('Unable to write test.txt to directory ' + dir )
+    return dir
 
 def mk_dir(dir):
     if not valid_path(dir):
@@ -187,6 +197,7 @@ def show_settings():
 
 
 # Cached values
+GN_VERSION         = get_setting('GN_VERSION')
 HOME               = get_setting('HOME')
 WEBSERVER_MODE     = get_setting('WEBSERVER_MODE')
 GN_SERVER_URL      = get_setting('GN_SERVER_URL')
@@ -205,7 +216,7 @@ GENENETWORK_FILES  = get_setting('GENENETWORK_FILES')
 PYLMM_COMMAND      = pylmm_command()
 GEMMA_COMMAND      = gemma_command()
 PLINK_COMMAND      = plink_command()
-TEMPDIR            = tempdir()
+TEMPDIR            = tempdir() # defaults to UNIX TMPDIR
 
 from six import string_types