Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(909)

Unified Diff: scripts/slave/unittests/runisolatedtest_test.py

Issue 218473003: Remove .isolated file rewriting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Replace 'build' with 'out' Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/runisolatedtest.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/unittests/runisolatedtest_test.py
diff --git a/scripts/slave/unittests/runisolatedtest_test.py b/scripts/slave/unittests/runisolatedtest_test.py
index f12cb654aa5f7c36144aa527121a55466c3203da..d5c5c8c743e9431e9eb840f29ee35a0533319630 100755
--- a/scripts/slave/unittests/runisolatedtest_test.py
+++ b/scripts/slave/unittests/runisolatedtest_test.py
@@ -38,13 +38,13 @@ class TestAll(unittest.TestCase):
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:
@@ -87,15 +87,17 @@ class TestAll(unittest.TestCase):
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 prefix
M-A Ruel 2014/03/31 20:35:11 Done.
}
with open(isolated) as f:
converted_data = json.load(f)
@@ -107,4 +109,6 @@ class TestAll(unittest.TestCase):
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()
« no previous file with comments | « scripts/slave/runisolatedtest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698