Remove .isolated file rewriting.

scripts/slave/unittests/runisolatedtest_test.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import os
 import shutil
 import sys
 import tempfile
@@ skipping 20 matching lines @@
 
   def test_arguments(self):
     actual = []
     runisolatedtest.run_command = lambda x: actual.append(x) or 0
     exe = os.path.join(self.tempdir, 'foo')
     isolated = exe + '.isolated'
 
     data = {
       'version': '1.0',
       'command': [ '../testing/test_env.py',
-                   r'..\build\Release/browser_test.exe'],
-      'files': { r'build\Release\testdata': {} },
+                   r'..\out\Release/browser_test.exe'],
+      'files': { r'out\Release\testdata': {} },
 
       'variables' : {
         'EXECUTABLE_SUFFIX' : '.exe',
         'OS' : 'win',
-        'PRODUCT_DIR' : '../build/Release'
+        'PRODUCT_DIR' : '../out/Release'
       },
     }
     with open(isolated, 'w') as f:
       json.dump(data, f)
 
     sample_line = [
       '--test_name', 'base_unittests',
       '--builder_name', "Linux Tests",
       '--checkout_dir',
       'build/',
@@ skipping 22 matching lines @@
         '--no-cr',
         '--gtest_output=xml:build/gtest-results/base_unittests.xml',
         '--shards', '1',
         '--index', '2',
         '--gtest_filter=Junk',
       ],
     ]
     res = runisolatedtest.main(sample_line)
 
     expected_data = {
-      'version': '1.0',
-      'command': [ '../testing/test_env.py',
-                   r'..\out\Release/browser_test.exe'],
-      'files': { r'out\Release\testdata': {} },
-      'variables' : {
-        'EXECUTABLE_SUFFIX' : '.exe',
-        'OS' : 'win',
-        'PRODUCT_DIR' : '../out/Release'
+      u'command': [
+        u'../testing/test_env.py',
+        u'..\\out\\Release/browser_test.exe',
+      ],
+      u'files': { u'out\\Release\\testdata': {} },
+      u'variables' : {
+        u'EXECUTABLE_SUFFIX' : u'.exe',
+        u'OS' : u'win',
+        u'PRODUCT_DIR' : u'../out/Release'
       },
+      u'version': u'1.0',

[Nico, 2014/03/31 15:22:34]

(not sure about the reordering and adding u prefixes everywhere; expected_data
now looks pretty different from data a few lines above for no good reason, and
this looks like an unrelated change. I'd undo the reordering and remove the u
prefixes, and keep the r above)

[M-A Ruel, 2014/03/31 20:35:11]

Done.

     }
     with open(isolated) as f:
       converted_data = json.load(f)
 
     self.assertEqual(expected_data, converted_data)
 
     self.assertEqual(0, res)
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
+  if '-v' in sys.argv:
+    unittest.TestCase.maxDiff = None

[Nico, 2014/03/31 15:22:34]

This looks unrelated too

[M-A Ruel, 2014/03/31 20:35:11]

Done.

   unittest.main()