Make MockOptions a thin wrapper around optparse.Values.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py

 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2012 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
 
 import unittest
 
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.commands.queries import *
 from webkitpy.tool.mock_tool import MockWebKitPatch, MockOptions
 
 
 class PrintExpectationsTest(unittest.TestCase):
 
-    def run_test(self, tests, expected_stdout, platform='test-win-win7', **args):
-        options = MockOptions(all=False, csv=False, full=False, platform=platform,
-                              include_keyword=[], exclude_keyword=[], paths=False).update(**args)
+    def run_test(self, tests, expected_stdout, platform='test-win-win7', **kwargs):
+        options_defaults = {
+            'all': False, 'csv': False, 'full': False, 'platform': platform,
+            'include_keyword': [], 'exclude_keyword': [], 'paths': False,
+        }
+        options_defaults.update(kwargs)
+        options = MockOptions(**options_defaults)
         tool = MockWebKitPatch()
         tool.port_factory.all_port_names = lambda: [
             'test-linux-trusty', 'test-linux-precise',
             'test-mac-mac10.11', 'test-mac-mac10.10',
             'test-win-win10', 'test-win-win7'
         ]
         command = PrintExpectations()
         command.bind_to_tool(tool)
 
         oc = OutputCapture()
@@ skipping 112 matching lines @@
     def test_csv(self):
         command = PrintBaselines()
         command.bind_to_tool(self.tool)
         self.capture_output()
         command.execute(MockOptions(all=False, platform='*win7', csv=True,
                                     include_virtual_tests=False), ['passes/text.html'], self.tool)
         stdout, _, _ = self.restore_output()
         self.assertMultiLineEqual(stdout,
                                   ('test-win-win7,passes/text.html,None,png,passes/text-expected.png,None\n'
                                    'test-win-win7,passes/text.html,None,txt,passes/text-expected.txt,None\n'))