chromium-build app now renders console from stored rows.

app_test.py

Index: app_test.py
diff --git a/app_test.py b/app_test.py
index 8981b446ad2ac097b67b17c5a099200e673d0946..127c06b842041be637e40ba66e9781272e8c546b 100644
--- a/app_test.py
+++ b/app_test.py
@@ -6,6 +6,7 @@
 import datetime
 import os
 import unittest
+import ast

[cmp, 2012/12/27 01:19:22]

move before line 6

[agable, 2012/12/28 23:56:08]

Done.

 
 import app
 
@@ -204,7 +205,7 @@ class ConsoleTestCase(GaeTestCase):
     expected_console = self._load_content(test_dir, 'console-expected.html')
     page_data = {'content': input_console}
     actual_console = app.console_handler(
-        _unquoted_localpath='chromium/console',
+        unquoted_localpath='chromium/console',
         remoteurl='http://build.chromium.org/p/chromium/console',
         page_data=page_data)
     # Uncomment if deeper inspection is needed of the returned console.
@@ -233,7 +234,7 @@ class ConsoleTestCase(GaeTestCase):
     expected_console = self._load_content(test_dir, 'console-expected.html')
     page_data = {'content': input_console}
     actual_console = app.console_handler(
-        _unquoted_localpath='chromium/console',
+        unquoted_localpath='chromium/console',
         remoteurl='http://build.chromium.org/p/chromium/console',
         page_data=page_data)
     # Uncomment if deeper inspection is needed of the returned console.
@@ -254,8 +255,6 @@ class ConsoleTestCase(GaeTestCase):
                                           'expected-details.html').strip()
     expected_summary = self._load_content(test_dir,
                                           'expected-summary.html').strip()
-    print(expected_summary)
-    print("\n\n\n\n")
     input_console = self._load_content(test_dir, 'console-input-handled.html')
     page_data = {'content': input_console}
     test_localpath = 'chromium/console'
@@ -266,12 +265,9 @@ class ConsoleTestCase(GaeTestCase):
         remoteurl='http://build.chromium.org/p/chromium/console',
         page_data=page_data)
     test_revision = '121192'
-    actual_row = app.Row.get_by_key_name(test_revision + ' ' + test_localpath)
-    actual_row = app.db.to_dict(actual_row)
-    actual_summary = app.Page.get_by_key_name(test_localpath + '/summary')
-    actual_summary = app.db.to_dict(actual_summary)
-    print(actual_summary['content']) 
-    self.assertEquals(expected_rev, actual_row['revision'],
+    actual_row = app.get_and_cache_rowdata(test_localpath + '/' + test_revision)
+    actual_summary = app.get_and_cache_pagedata(test_localpath + '/summary')
+    self.assertEquals(expected_rev, actual_row['rev'],
                       'Unexpected revision number found')
     self.assertEquals(expected_name, actual_row['name'],
                       'Unexpected revision author found')
@@ -285,132 +281,123 @@ class ConsoleTestCase(GaeTestCase):
                       'Unexpected build summary found')
 
 
+# def test_generate_handled_stuff(self):
+#   # Read in all the necessary input files.
+#   test_dir = os.path.join(TEST_DIR, 'test_console_merger')
+#   test_masters = ['linux', 'mac', 'win', 'memory']
+#   filenames = []
+#  #filenames = ['surroundings_input.html']
+#   for master in test_masters:
+#     localpath = 'chromium.%s/console' % master
+#     filename = '%s_console_input.html' % master
+#     fileobj = self._load_content(test_dir, filename)
+#     self.save_page(localpath, fileobj)
+#     page_data = app.get_and_cache_pagedata(localpath)
+#     remoteurl = 'http://build.chromium.org/p/%s' % localpath
+#     handled = app.console_handler(localpath, remoteurl, page_data)
+#     out = open('%s_console_handled.html' % master, 'w')
+#     out.write(handled['content'])

[cmp, 2012/12/27 01:19:22]

I suppose you used this to generate extra data that is in this CL.  We can
either remove these lines or keep them.  If we keep them, let's uncomment them
and name it something besides 'test_' so it's around but not run automatically. 
Some doc lines to describe how it's used would be good, too.

[agable, 2012/12/28 23:56:08]

I've decided to remove them. This was helpful for generating some of the inital
test data, but a fuller solution is necessary. I'll put a real
test-data-generator on my back burner and remove this mostly-useless stub.

On 2012/12/27 01:19:22, cmp wrote:

+
+
   def test_console_merger(self):
+    # Read in all the necessary input files.
     test_dir = os.path.join(TEST_DIR, 'test_console_merger')
-    filedata = {}
-    for filename in [
-        'chromium_chrome_console_input.html',
-        'chromium_chromiumos_console_input.html',
-        'chromium_main_console_input.html',
-        'chromium_memory_console_input.html',
-        'chromium_merged_console.html',
-    ]:
-      filedata[filename] = self._load_content(test_dir, filename)
-    self.save_page(localpath='chromium.chrome/console',
-                   content=filedata['chromium_chrome_console_input.html'])
-    self.save_page(localpath='chromium.chromiumos/console',
-                   content=filedata['chromium_chromiumos_console_input.html'])
-    self.save_page(localpath='chromium.main/console',
-                   content=filedata['chromium_main_console_input.html'])
-    self.save_page(localpath='chromium.memory/console',
-                   content=filedata['chromium_memory_console_input.html'])
-    page_data = {'content': filedata['chromium_merged_console.html']}
+    test_masters = ['linux', 'mac', 'win', 'memory']
+    filenames = ['latest_rev.txt', 'surroundings_input.html']
+    for master in test_masters:
+      filenames += ['%s_categories_input.html' % master,
+                    '%s_summary_input.html' % master,
+                    '%s_row_input.txt' % master]
+    filenames.append('merged_console_output.html')
+    files = {}
+    for filename in filenames:
+      files[filename] = self._load_content(test_dir, filename)
+
+    # Save the input files as the corresponding pages and rows.
+    test_rev = files['latest_rev.txt'].strip()
+    app.memcache.set(key='latest_rev', value=test_rev)
+    self.save_page(localpath='surroundings',
+                   content=files['surroundings_input.html'])
+    for master in test_masters:
+      self.save_page('chromium.%s/console/categories' % master,
+                     files['%s_categories_input.html' % master])
+      self.save_page('chromium.%s/console/summary' % master,
+                     files['%s_summary_input.html' % master])
+      app.save_row(ast.literal_eval(files['%s_row_input.txt' % master]),
+                   'chromium.%s/console/%s' % (master, test_rev),
+                   datetime.datetime.now())
+
+    # Get the expected and real output, compare.
+    self.save_page('merged_output', files['merged_console_output.html'])
     app.console_merger(
-        'chromium.main/console',
-        'http://build.chromium.org/p/chromium/console',
-        page_data=page_data,
+        'chromium/console', '', {},
         masters_to_merge=[
-            'chromium.main',
-            'chromium.chromiumos',
-            'chromium.chrome',
+            'chromium.linux',
+            'chromium.mac',
+            'chromium.win',
             'chromium.memory',
-        ])
+        ],
+        num_rows_to_merge=1)
     actual_mergedconsole = app.get_and_cache_pagedata('chromium/console')
     # Uncomment if deeper inspection is needed of the returned console.
     # import logging
     # logging.debug('foo')
-    # with open(os.path.join(test_dir, 'chromium_merged_console.html'),
+    # with open(os.path.join(test_dir, 'merged_console_output.html'),
     #           'w') as fh:
     #   fh.write(actual_mergedconsole['content'])
     # import code
     # code.interact(local=locals())
-    self.assertEquals(filedata['chromium_merged_console.html'],
-                      actual_mergedconsole['content'],
-                      'Unexpected console output found')
-
-  def test_console_merger_utf8(self):

[cmp, 2012/12/27 01:19:22]

Not sure if you mean to remove test_console_merger_utf8 completely.  That seems
like it may be an accident.

-    test_dir = os.path.join(TEST_DIR, 'test_console_merger_utf8')
-    filedata = {}
-    for filename in [
-        'chromium_chrome_console_input.html',
-        'chromium_chromiumos_console_input.html',
-        'chromium_main_console_input.html',
-        'chromium_memory_console_input.html',
-        'chromium_merged_console.html',
-    ]:
-      filedata[filename] = self._load_content(test_dir, filename)
-    self.save_page(localpath='chromium.chrome/console',
-                   content=filedata['chromium_chrome_console_input.html'])
-    self.save_page(localpath='chromium.chromiumos/console',
-                   content=filedata['chromium_chromiumos_console_input.html'])
-    self.save_page(localpath='chromium.main/console',
-                   content=filedata['chromium_main_console_input.html'])
-    self.save_page(localpath='chromium.memory/console',
-                   content=filedata['chromium_memory_console_input.html'])
-    page_data = {'content': filedata['chromium_merged_console.html']}
-    app.console_merger(
-        'chromium.main/console',
-        'http://build.chromium.org/p/chromium/console',
-        page_data=page_data,
-        masters_to_merge=[
-            'chromium.main',
-            'chromium.chromiumos',
-            'chromium.chrome',
-            'chromium.memory',
-        ])
-    actual_mergedconsole = app.get_and_cache_pagedata('chromium/console')
-    # Uncomment if deeper inspection is needed of the returned console.
-    # import logging
-    # logging.debug('foo')
-    # merged_path = os.path.join(test_dir, 'chromium_merged_console.html')
-    # with open(merged_path, 'w') as fh:
-    #   fh.write(actual_mergedconsole['content'])
-    # import code
-    # code.interact(local=locals())
-    self.assertEquals(filedata['chromium_merged_console.html'],
+    self.assertEquals(files['merged_console_output.html'],
                       actual_mergedconsole['content'],
                       'Unexpected console output found')
 
   def test_console_merger_splitrevs(self):
+    # Read in all the necessary input files.
     test_dir = os.path.join(TEST_DIR, 'test_console_merger_splitrevs')
-    filedata = {}
-    for filename in [
-        'chromium_chrome_console.html',
-        'chromium_chromiumos_console.html',
-        'chromium_console.html',
-        'chromium_memory_console.html',
-        'chromium_merged_console.html',
-    ]:
-      filedata[filename] = self._load_content(test_dir, filename)
-    self.save_page(localpath='chromium.chrome/console',
-                   content=filedata['chromium_chrome_console.html'])
-    self.save_page(localpath='chromium.chromiumos/console',
-                   content=filedata['chromium_chromiumos_console.html'])
-    self.save_page(localpath='chromium.main/console',
-                   content=filedata['chromium_console.html'])
-    self.save_page(localpath='chromium.memory/console',
-                   content=filedata['chromium_memory_console.html'])
-    page_data = {'content': filedata['chromium_merged_console.html']}
+    test_masters = ['linux', 'mac']
+    filenames = ['latest_rev.txt', 'surroundings_input.html']
+    for master in test_masters:
+      filenames += ['%s_categories_input.html' % master,
+                    '%s_summary_input.html' % master,
+                    '%s_row_input.txt' % master]
+    filenames.append('merged_console_output.html')
+    files = {}
+    for filename in filenames:
+      files[filename] = self._load_content(test_dir, filename)
+
+    # Save the input files as the corresponding pages and rows.
+    test_rev = files['latest_rev.txt'].strip()
+    app.memcache.set(key='latest_rev', value=test_rev)
+    self.save_page(localpath='surroundings',
+                   content=files['surroundings_input.html'])
+    for master in test_masters:
+      self.save_page('chromium.%s/console/categories' % master,
+                     files['%s_categories_input.html' % master])
+      self.save_page('chromium.%s/console/summary' % master,
+                     files['%s_summary_input.html' % master])
+      app.save_row(ast.literal_eval(files['%s_row_input.txt' % master]),
+                   'chromium.%s/console/%s' % (master, test_rev),
+                   datetime.datetime.now())
+
+    # Get the expected and real output, compare.
+    self.save_page('merged_output', files['merged_console_output.html'])
     app.console_merger(
-        'chromium.main/console',
-        'http://build.chromium.org/p/chromium/console',
-        page_data=page_data,
+        'chromium/console', '', {},
         masters_to_merge=[
-            'chromium.main',
-            'chromium.chromiumos',
-            'chromium.chrome',
-            'chromium.memory',
-        ])
+            'chromium.linux',
+            'chromium.mac',
+        ],
+        num_rows_to_merge=1)
     actual_mergedconsole = app.get_and_cache_pagedata('chromium/console')
     # Uncomment if deeper inspection is needed of the returned console.
     # import logging
     # logging.debug('foo')
-    # with open(os.path.join(test_dir, 'chromium_merged_console.html'),
+    # with open(os.path.join(test_dir, 'merged_console_output.html'),
     #           'w') as fh:
     #   fh.write(actual_mergedconsole['content'])
     # import code
     # code.interact(local=locals())
-    self.assertEquals(filedata['chromium_merged_console.html'],
+    self.assertEquals(files['merged_console_output.html'],
                       actual_mergedconsole['content'],
                       'Unexpected console output found')