Changeset 85427 in webkit
- Timestamp:
- May 1, 2011 12:20:45 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 added
- 2 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r85424 r85427 1 2011-05-01 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Move scm.py into its own module in preparation for splitting it up 6 https://bugs.webkit.org/show_bug.cgi?id=59884 7 8 * Scripts/webkitpy/common/checkout/scm/__init__.py: Added. 9 * Scripts/webkitpy/common/checkout/scm/scm.py: Moved. 10 * Scripts/webkitpy/common/checkout/scm/scm_unittest.py: Moved. 11 * Scripts/webkitpy/test/main.py: 12 1 13 2011-05-01 Adam Barth <abarth@webkit.org> 2 14 -
trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py
r85425 r85427 1 1 # Copyright (c) 2009, Google Inc. All rights reserved. 2 2 # Copyright (c) 2009 Apple Inc. All rights reserved. 3 # 3 # 4 4 # Redistribution and use in source and binary forms, with or without 5 5 # modification, are permitted provided that the following conditions are 6 6 # met: 7 # 7 # 8 8 # * Redistributions of source code must retain the above copyright 9 9 # notice, this list of conditions and the following disclaimer. … … 15 15 # contributors may be used to endorse or promote products derived from 16 16 # this software without specific prior written permission. 17 # 17 # 18 18 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 19 19 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT … … 84 84 if SVN.in_working_directory(absolute_path): 85 85 return SVN(cwd=absolute_path, patch_directories=patch_directories) 86 86 87 87 if Git.in_working_directory(absolute_path): 88 88 return Git(cwd=absolute_path) 89 89 90 90 return None 91 91 … … 365 365 def in_working_directory(path): 366 366 return os.path.isdir(os.path.join(path, '.svn')) 367 367 368 368 @classmethod 369 369 def find_uuid(cls, path): … … 696 696 # FIXME: This should probably use cwd=self.checkout_root 697 697 self.run(['git', 'reset', '--hard', self.remote_branch_ref()]) 698 698 699 699 def local_commits(self): 700 700 # FIXME: This should probably use cwd=self.checkout_root -
trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
r85425 r85427 510 510 @@ -1,5 +1,13 @@ 511 511 2009-10-26 Eric Seidel <eric@webkit.org> 512 512 513 513 + Reviewed by NOBODY (OOPS!). 514 514 + … … 520 520 + 521 521 Reviewed by Foo Bar. 522 522 523 523 Most awesome change ever. 524 524 """ … … 536 536 +++ ChangeLog (working copy) 537 537 @@ -2,6 +2,14 @@ 538 538 539 539 Reviewed by Foo Bar. 540 540 541 541 + Second most awesome change ever. 542 542 + … … 548 548 + 549 549 Most awesome change ever. 550 550 551 551 * scm_unittest.py: 552 552 """ … … 1014 1014 def test_commitish_parsing(self): 1015 1015 scm = detect_scm_system(self.git_checkout_path) 1016 1016 1017 1017 # Multiple revisions are cherry-picked. 1018 1018 self.assertEqual(len(scm.commit_ids_from_commitish_arguments(['HEAD~2'])), 1) 1019 1019 self.assertEqual(len(scm.commit_ids_from_commitish_arguments(['HEAD', 'HEAD~2'])), 2) 1020 1020 1021 1021 # ... is an invalid range specifier 1022 1022 self.assertRaises(ScriptError, scm.commit_ids_from_commitish_arguments, ['trunk...HEAD']) -
trunk/Tools/Scripts/webkitpy/test/main.py
r79181 r85427 97 97 """Run the unit tests in all *_unittest.py modules in webkitpy. 98 98 99 This method excludes "webkitpy.common.checkout.scm _unittest" unless99 This method excludes "webkitpy.common.checkout.scm.scm_unittest" unless 100 100 the --all option is the second element of sys_argv. 101 101 … … 141 141 sys.argv.remove("--all") 142 142 else: 143 excluded_module = "webkitpy.common.checkout.scm _unittest"143 excluded_module = "webkitpy.common.checkout.scm.scm_unittest" 144 144 _log.info("Excluding: %s (use --all to include)" % excluded_module) 145 145 modules.remove(excluded_module) … … 147 147 if sys.platform == 'win32': 148 148 modules = filter(self._win32_blacklist, modules) 149 150 # unittest.main has horrible error reporting when module imports are bad 151 # so we test import here to make debugging bad imports much easier. 152 for module in modules: 153 __import__(module) 149 154 150 155 sys_argv.extend(modules)
Note: See TracChangeset
for help on using the changeset viewer.