Changeset 148183 in webkit
- Timestamp:
- Apr 11, 2013 1:27:06 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r148181 r148183 1 2013-04-11 Glenn Adams <glenn@skynav.com> 2 3 [webkitpy] Remove lingering return_exit_code usage in scm_mock and rebaselineserver. 4 https://bugs.webkit.org/show_bug.cgi?id=114418 5 6 Reviewed by Ryosuke Niwa. 7 8 * Scripts/webkitpy/common/checkout/scm/scm_mock.py: 9 (MockSCM.add): Remove optional remove_exit_code argument. 10 (MockSCM.add_list): Remove optional remove_exit_code argument and return value. 11 * Scripts/webkitpy/tool/servers/rebaselineserver.py: 12 (_rebaseline_test): Use ScriptError to capture SCM.add() failure and exit code. 13 (_move_test_baselines): Use ScriptError to capture SCM.add() failure and exit code. 14 1 15 2013-04-11 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py
r145141 r148183 39 39 self._executive = executive or MockExecutive() 40 40 41 def add(self, destination_path , return_exit_code=False):42 self.add_list([destination_path] , return_exit_code)41 def add(self, destination_path): 42 self.add_list([destination_path]) 43 43 44 def add_list(self, destination_paths , return_exit_code=False):44 def add_list(self, destination_paths): 45 45 self.added_paths.update(set(destination_paths)) 46 if return_exit_code:47 return 048 46 49 47 def has_working_directory_changes(self): -
trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
r130356 r148183 33 33 34 34 from webkitpy.common.host import Host # FIXME: This should not be needed! 35 from webkitpy.common.system.executive import ScriptError 35 36 from webkitpy.layout_tests.port.base import Port 36 37 from webkitpy.tool.servers.reflectionhandler import ReflectionHandler … … 115 116 target_expectations_directory, destination_file) 116 117 filesystem.copyfile(source_path, destination_path) 117 exit_code = scm.add(destination_path, return_exit_code=True) 118 if exit_code: 118 try: 119 scm.add(destination_path) 120 log(' Updated %s' % destination_file) 121 except ScriptError, error: 119 122 log(' Could not update %s in SCM, exit code %d' % 120 (destination_file, e xit_code))123 (destination_file, error.exit_code)) 121 124 return False 122 else:123 log(' Updated %s' % destination_file)124 125 125 126 return True … … 151 152 destination_path = filesystem.join(destination_directory, file_name) 152 153 filesystem.copyfile(source_path, destination_path) 153 exit_code = test_config.scm.add(destination_path, return_exit_code=True) 154 if exit_code: 154 try: 155 test_config.scm.add(destination_path) 156 log(' Moved %s' % file_name) 157 except ScriptError, error: 155 158 log(' Could not update %s in SCM, exit code %d' % 156 (file_name, e xit_code))159 (file_name, error.exit_code)) 157 160 return False 158 else:159 log(' Moved %s' % file_name)160 161 161 162 return True
Note: See TracChangeset
for help on using the changeset viewer.