only one trace logging system

Author: rohe

script/optest.py

@@ -11,9 +11,10 @@
 
 from otest.aus.app import WebApplication
 from otest.aus.client import Factory
-from otest.aus.io import WebIO
+from otest.aus.handling import WebIh
 from otest.conf_setup import construct_app_args
-from otest.utils import SERVER_LOG_FOLDER, setup_logging
+from otest.utils import SERVER_LOG_FOLDER
+from otest.utils import setup_logging
 from otest.utils import setup_common_log
 
 from oidctest.app_conf import REST
@@ -115,7 +116,7 @@ def pick_grp(name):
 
     setup_logging("%s/rp_%s.log" % (SERVER_LOG_FOLDER, args.port), logger)
 
-    WA = WebApplication(sessionhandler=SessionHandler, webio=WebIO,
+    WA = WebApplication(sessionhandler=SessionHandler, webio=WebIh,
                         webtester=WebTester, check=check, webenv=app_args,
                         pick_grp=pick_grp, path=_path)
 

test_tool/test_op/server/heart_mako/htdocs/logs.mako

@@ -14,20 +14,19 @@ def display_log(base, logs, issuer, profile):
 
     if profile:
         for name, path in logs:
-            el += '<li><a href="{}{}" download="{}{}.html">{}</a>'.format(
-                base, path, base, name, name)
-    elif 'issuer':
+            el += '<li><a href="{}{}" download="{}.html">{}</a>'.format(
+                base, path, name, name)
+    elif issuer:
         for name, path in logs:
-            _tarfile = "{}/%s.tar".format(base,path.replace("log", "tar"))
-            el += '<li><a href="{}{}">{}</a> tar file:<a href="{}{}">Download logs</a>'.format(
-                base, path, name, base,_tarfile)
+            _tarfile = "{}{}.tar".format(base, path.replace("log", "tar"))
+            el += '<li><a href="{}{}">{}</a> tar file:<a href="{}">Download logs</a>'.format(
+                base, path, name, _tarfile)
     else:
         for name, path in logs:
-            el += '<li><a href="{}{}">%s</a>' % (base, path, name)
+            el += '<li><a href="{}{}">{}</a>'.format(base, path, name)
     el += "</ul>"
     return el
 %>
-
 <%
     LINK_INFO = [
     {
@@ -79,7 +78,7 @@ def display_log(base, logs, issuer, profile):
      <!-- Main component for a primary marketing message or call to action -->
       <div class="jumbotron">
         <h1>HEART OIDC OP Test logs</h1>
-            ${display_log(basr, logs, issuer, profile)}
+            ${display_log(base, logs, issuer, profile)}
       </div>
 
     </div> <!-- /container -->