| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2012 The LUCI Authors. All rights reserved. | 2 # Copyright 2012 The LUCI Authors. All rights reserved. |
| 3 # Use of this source code is governed under the Apache License, Version 2.0 | 3 # Use of this source code is governed under the Apache License, Version 2.0 |
| 4 # that can be found in the LICENSE file. | 4 # that can be found in the LICENSE file. |
| 5 | 5 |
| 6 import cStringIO | 6 import cStringIO |
| 7 import hashlib | 7 import hashlib |
| 8 import json | 8 import json |
| 9 import logging | 9 import logging |
| 10 import optparse | 10 import optparse |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 outdir = os.path.join(self.directory, 'outdir') | 282 outdir = os.path.join(self.directory, 'outdir') |
| 283 isolate = isolate_file | 283 isolate = isolate_file |
| 284 blacklist = list(isolateserver.DEFAULT_BLACKLIST) | 284 blacklist = list(isolateserver.DEFAULT_BLACKLIST) |
| 285 path_variables = {} | 285 path_variables = {} |
| 286 config_variables = { | 286 config_variables = { |
| 287 'OS': 'linux', | 287 'OS': 'linux', |
| 288 'chromeos': 1, | 288 'chromeos': 1, |
| 289 } | 289 } |
| 290 extra_variables = {'foo': 'bar'} | 290 extra_variables = {'foo': 'bar'} |
| 291 ignore_broken_items = False | 291 ignore_broken_items = False |
| 292 collapse_symlinks = False |
| 292 return Options() | 293 return Options() |
| 293 | 294 |
| 294 def _cleanup_isolated(self, expected_isolated): | 295 def _cleanup_isolated(self, expected_isolated): |
| 295 """Modifies isolated to remove the non-deterministic parts.""" | 296 """Modifies isolated to remove the non-deterministic parts.""" |
| 296 if sys.platform == 'win32': | 297 if sys.platform == 'win32': |
| 297 # 'm' are not saved in windows. | 298 # 'm' are not saved in windows. |
| 298 for values in expected_isolated['files'].itervalues(): | 299 for values in expected_isolated['files'].itervalues(): |
| 299 self.assertTrue(values.pop('m')) | 300 self.assertTrue(values.pop('m')) |
| 300 | 301 |
| 301 def _cleanup_saved_state(self, actual_saved_state): | 302 def _cleanup_saved_state(self, actual_saved_state): |
| (...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1619 | 1620 |
| 1620 def clear_env_vars(): | 1621 def clear_env_vars(): |
| 1621 for e in ('ISOLATE_DEBUG', 'ISOLATE_SERVER'): | 1622 for e in ('ISOLATE_DEBUG', 'ISOLATE_SERVER'): |
| 1622 os.environ.pop(e, None) | 1623 os.environ.pop(e, None) |
| 1623 | 1624 |
| 1624 | 1625 |
| 1625 if __name__ == '__main__': | 1626 if __name__ == '__main__': |
| 1626 fix_encoding.fix_encoding() | 1627 fix_encoding.fix_encoding() |
| 1627 clear_env_vars() | 1628 clear_env_vars() |
| 1628 test_utils.main() | 1629 test_utils.main() |
| OLD | NEW |