diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 18:29:23 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 18:29:23 +0000 |
commit | a52b63a15bd0c76d93e4e74710af88ce9d1864e8 (patch) | |
tree | 747d9b873264ab26c56d95b3add6ff709c883957 /tools | |
parent | d0aa2b79de284d699faa13087242cfa3f398a68a (diff) | |
download | chromium_src-a52b63a15bd0c76d93e4e74710af88ce9d1864e8.zip chromium_src-a52b63a15bd0c76d93e4e74710af88ce9d1864e8.tar.gz chromium_src-a52b63a15bd0c76d93e4e74710af88ce9d1864e8.tar.bz2 |
Remove CompleteState.out_dir, it was never used.
R=csharp@chromium.org
NOTRY=true
BUG=
Review URL: https://chromiumcodereview.appspot.com/10965065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/isolate/isolate.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/isolate/isolate.py b/tools/isolate/isolate.py index 5582404..5438690 100755 --- a/tools/isolate/isolate.py +++ b/tools/isolate/isolate.py @@ -1320,7 +1320,7 @@ class SavedState(Flattenable): class CompleteState(object): """Contains all the state to run the task at hand.""" - def __init__(self, result_file, result, saved_state, out_dir): + def __init__(self, result_file, result, saved_state): super(CompleteState, self).__init__() self.result_file = result_file # Contains the data that will be used by run_test_from_archive.py @@ -1328,17 +1328,15 @@ class CompleteState(object): # Contains the data to ease developer's use-case but that is not strictly # necessary. self.saved_state = saved_state - self.out_dir = out_dir @classmethod - def load_files(cls, result_file, out_dir): + def load_files(cls, result_file): """Loads state from disk.""" assert os.path.isabs(result_file), result_file return cls( result_file, Result.load_file(result_file), - SavedState.load_file(result_to_state(result_file)), - out_dir) + SavedState.load_file(result_to_state(result_file))) def load_isolate(self, isolate_file, variables): """Updates self.result and self.saved_state with information loaded from a @@ -1457,11 +1455,11 @@ def load_complete_state(options, level): if options.result: # Load the previous state if it was present. Namely, "foo.result" and # "foo.state". - complete_state = CompleteState.load_files(options.result, options.outdir) + complete_state = CompleteState.load_files(options.result) else: # Constructs a dummy object that cannot be saved. Useful for temporary # commands like 'run'. - complete_state = CompleteState(None, Result(), SavedState(), options.outdir) + complete_state = CompleteState(None, Result(), SavedState()) options.isolate = options.isolate or complete_state.saved_state.isolate_file if not options.isolate: raise ExecutionError('A .isolate file is required.') |