首頁 探索 說明
登入
RONCC
/
Geografic-Information-System
關註 1
讚好 0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

gunittest: index page for report with two links (to testsuites and to test files), proper HTML header for file with Unicode character (atempt to fix it in Chrome)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61494 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 10 年之前
父節點
99ce86eb18
當前提交
ffc9c524f6
共有 3 個文件被更改，包括 26 次插入 和 7 次删除
統一視圖 顯示文件統計
  1. 17 1
      lib/python/gunittest/invoker.py
  2. 4 3
      lib/python/gunittest/multireport.py
  3. 5 3
      lib/python/gunittest/reporters.py

+ 17 - 1
lib/python/gunittest/invoker.py
查看文件 

@@ -183,7 +183,8 @@ class GrassTestFilesInvoker(object):
 
             reporters=[
 
             reporters=[
 
                 GrassTestFilesTextReporter(stream=sys.stderr),
 
                 GrassTestFilesTextReporter(stream=sys.stderr),
 
                 GrassTestFilesHtmlReporter(
 
                 GrassTestFilesHtmlReporter(
 
-                    file_anonymizer=self._file_anonymizer),
 
+                    file_anonymizer=self._file_anonymizer,
 
+                    main_page_name='testfiles.html'),
 
                 GrassTestFilesKeyValueReporter(
 
                 GrassTestFilesKeyValueReporter(
 
                     info=dict(location=location, location_type=location_type))
 
                     info=dict(location=location, location_type=location_type))
 
             ])
 
             ])
 
@@ -204,6 +205,21 @@ class GrassTestFilesInvoker(object):
 
                                   gisdbase=gisdbase, location=location)
 
                                   gisdbase=gisdbase, location=location)
 
         self.reporter.finish()
 
         self.reporter.finish()
 
 
 
+        # TODO: move this to some (new?) reporter
 
+        # TODO: add basic summary of linked files so that the page is not empty
 
+        with open(os.path.join(results_dir, 'index.html'), 'w') as main_index:
 
+            main_index.write(
 
+                '<html><body>'
 
+                '<h1>Tests for &lt;{location}&gt;'
 
+                ' using &lt;{type}&gt; type tests</h1>'
 
+                '<ul>'
 
+                '<li><a href="testsuites.html">Results by testsuites</a>'
 
+                ' (testsuite directories)</li>'
 
+                '<li><a href="testfiles.html">Results by test files</a></li>'
 
+                '<ul>'
 
+                '</body></html>'
 
+                .format(location=location, type=location_type))
 
+
 
         testsuite_dir_reporter = TestsuiteDirReporter(
 
         testsuite_dir_reporter = TestsuiteDirReporter(
 
             main_page_name='testsuites.html', testsuite_page_name='index.html',
 
             main_page_name='testsuites.html', testsuite_page_name='index.html',
 
             top_level_testsuite_page_name='testsuite_index.html')
 
             top_level_testsuite_page_name='testsuite_index.html')

+ 4 - 3
lib/python/gunittest/multireport.py
查看文件 

@@ -238,7 +238,7 @@ def main():
 
             # let's consider no location as valid state and use 'unknown'
 
             # let's consider no location as valid state and use 'unknown'
 
             result.location = summary.get('location', 'unknown')
 
             result.location = summary.get('location', 'unknown')
 
             result.location_type = summary.get('location_type', 'unknown')
 
             result.location_type = summary.get('location_type', 'unknown')
 
-            # grouping accoring to location types
 
+            # grouping according to location types
 
             # this can cause that two actual locations tested at the same time
 
             # this can cause that two actual locations tested at the same time
 
             # will end up together, this is not ideal but testing with
 
             # will end up together, this is not ideal but testing with
 
             # one location type and different actual locations is not standard
 
             # one location type and different actual locations is not standard
 
@@ -254,7 +254,7 @@ def main():
 
     locations_main_page = open(os.path.join(output, 'index.html'), 'w')
 
     locations_main_page = open(os.path.join(output, 'index.html'), 'w')
 
     locations_main_page.write(
 
     locations_main_page.write(
 
         '<html><body>'
 
         '<html><body>'
 
-        '<h1>Test reports accoring to locations</h1>'
 
+        '<h1>Test reports grouped by location type</h1>'
 
         '<table>'
 
         '<table>'
 
         '<thead><tr>'
 
         '<thead><tr>'
 
         '<th>Location</th>'
 
         '<th>Location</th>'
 
@@ -272,7 +272,8 @@ def main():
 
         if location_type == 'unknown':
 
         if location_type == 'unknown':
 
             title = 'Test reports'
 
             title = 'Test reports'
 
         else:
 
         else:
 
-            title = 'Test reports for ' + location_type + ' location'
 
+            title = ('Test reports for &lt;{type}&gt; location type'
 
+                     .format(type=location_type))
 
 
 
         x = [date2num(result.timestamp) for result in results]
 
         x = [date2num(result.timestamp) for result in results]
 
         xlabels = [result.timestamp.strftime("%Y-%m-%d") + ' (r' + result.svn_revision + ')' for result in results]
 
         xlabels = [result.timestamp.strftime("%Y-%m-%d") + ' (r' + result.svn_revision + ')' for result in results]

+ 5 - 3
lib/python/gunittest/reporters.py
查看文件 

@@ -498,15 +498,17 @@ class GrassTestFilesHtmlReporter(GrassTestFilesCountingReporter):
 
 
 
     unknown_number = UNKNOWN_NUMBER_HTML
 
     unknown_number = UNKNOWN_NUMBER_HTML
 
 
 
-    def __init__(self, file_anonymizer):
 
+    def __init__(self, file_anonymizer, main_page_name='index.html'):
 
         super(GrassTestFilesHtmlReporter, self).__init__()
 
         super(GrassTestFilesHtmlReporter, self).__init__()
 
         self.main_index = None
 
         self.main_index = None
 
         self._file_anonymizer = file_anonymizer
 
         self._file_anonymizer = file_anonymizer
 
+        self._main_page_name = main_page_name
 
 
 
     def start(self, results_dir):
 
     def start(self, results_dir):
 
         super(GrassTestFilesHtmlReporter, self).start(results_dir)
 
         super(GrassTestFilesHtmlReporter, self).start(results_dir)
 
         # having all variables public although not really part of API
 
         # having all variables public although not really part of API
 
-        self.main_index = open(os.path.join(results_dir, 'index.html'), 'w')
 
+        main_page_name = os.path.join(results_dir, self._main_page_name)
 
+        self.main_index = open(main_page_name, 'w')
 
 
 
         # TODO: this can be moved to the counter class
 
         # TODO: this can be moved to the counter class
 
         self.failures = 0
 
         self.failures = 0
 
@@ -649,7 +651,7 @@ class GrassTestFilesHtmlReporter(GrassTestFilesCountingReporter):
 
         file_index_path = os.path.join(cwd, 'index.html')
 
         file_index_path = os.path.join(cwd, 'index.html')
 
         file_index = open(file_index_path, 'w')
 
         file_index = open(file_index_path, 'w')
 
         file_index.write(
 
         file_index.write(
 
-            '<html><body>'
 
+            '<!DOCTYPE html><html><head><meta charset="utf-8"></head><body>'
 
             '<h1>{m.name}</h1>'
 
             '<h1>{m.name}</h1>'
 
             '<h2>{m.tested_dir} &ndash; {m.name}</h2>'
 
             '<h2>{m.tested_dir} &ndash; {m.name}</h2>'
 
             '{status}'
 
             '{status}'