diff --git a/BUGS.md b/BUGS.md
index 56ab520..092e358 100644
--- a/BUGS.md
+++ b/BUGS.md
@@ -1,9 +1,9 @@
# BUGS
-- argumentos da linha de comando a funcionar.
- usar thread.Lock para aceder a variaveis de estado.
- permitir adicionar imagens nas perguntas.
+- debug mode: log levels not working
# TODO
@@ -22,6 +22,7 @@
# FIXED
+- argumentos da linha de comando a funcionar.
- configuracao dos logs cherrypy para se darem bem com os outros
- browser e ip usados gravado no test.
- botões allow all/deny all.
diff --git a/questions.py b/questions.py
index 1f05f5b..fa19dd1 100644
--- a/questions.py
+++ b/questions.py
@@ -48,6 +48,7 @@ else:
# ---------------------------------------------------------------------------
# Runs a script and returns its stdout parsed as yaml, or None on error.
+# Note: requires python 3.5+
# ---------------------------------------------------------------------------
def run_script(script, stdin='', timeout=5):
try:
diff --git a/serve.py b/serve.py
index 402c19f..7ecc197 100755
--- a/serve.py
+++ b/serve.py
@@ -234,8 +234,9 @@ if __name__ == '__main__':
# --- parse command line arguments and build base test
arg = parse_arguments()
- if arg.debug:
+ if arg.debug: # FIXME log.level DEBUG not working
LOGGER_CONF = path.join(SERVER_PATH, 'config/logger-debug.yaml')
+ filename = path.abspath(path.expanduser(arg.testfile[0]))
# --- Setup logging
with open(LOGGER_CONF,'r') as f:
@@ -244,10 +245,6 @@ if __name__ == '__main__':
# --- start application
from app import App
- # FIXME do not send args that were not defined in the commandline
- # this means options should be like --show-ref=true|false
- # and have no default value
- filename = path.abspath(path.expanduser(arg.testfile[0]))
try:
app = App(filename, vars(arg))
except:
@@ -275,8 +272,6 @@ if __name__ == '__main__':
'tools.secureheaders.on': True,
'tools.staticdir.root': SERVER_PATH,
- 'tools.staticdir.dir': 'static', # where to get js,css,jpg,...
- 'tools.staticdir.on': True,
},
'/adminwebservice': {
'request.dispatch': cherrypy.dispatch.MethodDispatcher(),
@@ -284,9 +279,9 @@ if __name__ == '__main__':
'tools.response_headers.headers': [('Content-Type', 'text/plain')],
},
'/static': {
- 'tools.auth.on': False, # everything in /static is public
+ 'tools.auth.on': False, # everything in /static is public
'tools.staticdir.on': True,
- 'tools.staticdir.dir': 'static', # where to get js,css,jpg,...
+ 'tools.staticdir.dir': 'static',# where to get js, css, ...
},
}
diff --git a/templates/admin.html b/templates/admin.html
index 8e4c8ee..5adfbfe 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -5,14 +5,14 @@
Admin
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/templates/test.html b/templates/test.html
index 2bf3884..f593bfc 100644
--- a/templates/test.html
+++ b/templates/test.html
@@ -14,7 +14,7 @@
});
-
@@ -330,7 +330,7 @@
-
-
+
+