Merge pull request #127 from direvius/master

start IOloop, render offline report
yandex · Dec 29, 2014 · 68d2618 · 68d2618
2 parents 5872d68 + c25670d
commit 68d2618
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/Tank/Plugins/OnlineReport/plugin.py b/Tank/Plugins/OnlineReport/plugin.py
@@ -66,16 +66,15 @@ def start_test(self):
 
 
     def end_test(self, retcode):
+        self.log.info("Ended test. Sending command to reload pages.")
         self.server.reload()
         return retcode
 
 
     def run(self):
         if (self.server):
-            address = socket.gethostname()
-            self.log.info("Starting local HTTP server for online view at port: http://%s:%s/", address, self.port)
             self.server.serve()
-            self.server.reload()
+            self.log.info("Server started.")
 
 
     def aggregate_second(self, data):
@@ -100,10 +99,11 @@ def post_process(self, retcode):
         self.log.info("Building HTML report...")
         report_html = self.core.mkstemp(".html", "report_")
         self.core.add_artifact_file(report_html)
-        #with open(report_html, 'w') as report_html_file:
-        #    report_html_file.write(
-        #        requests.get('http://localhost:8001/offline.html').text
-        #    )
+        with open(report_html, 'w') as report_html_file:
+           report_html_file.write(
+               #requests.get('http://localhost:8001/offline.html').text
+               self.server.render_offline()
+           )
         #raw_input('Press Enter to stop report server.')
         self.server.stop()
         del self.server

diff --git a/Tank/Plugins/OnlineReport/server.py b/Tank/Plugins/OnlineReport/server.py
@@ -76,6 +76,7 @@ def get(self):
 class ReportServer(object):
     def __init__(self, cacher):
         router = TornadioRouter(Client)
+        self.cacher = cacher
         self.reportUUID = uuid.uuid4().hex
         self.app = tornado.web.Application(
             router.apply_routes([
@@ -92,7 +93,7 @@ def __init__(self, cacher):
 
     def serve(self):
         def run_server(server):
-            server.start() 
+            tornado.ioloop.IOLoop.instance().start()
 
         self.server = SocketServer(self.app, auto_start = False)
         th = Thread(target=run_server, args=(self.server,))
@@ -109,3 +110,11 @@ def send(self, data):
     def reload(self):
         for connection in Client.CONNECTIONS:
             connection.emit('reload')
+
+    def render_offline(self):
+        loader = template.Loader(os.path.join(os.path.dirname(__file__), "templates"))
+        cached_data = {
+          'data': self.cacher.get_all_data(),
+          'uuid': self.reportUUID,
+        }
+        return loader.load('offline.jade').generate(cached_data=json.dumps(cached_data))