OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 """Unit tests for git_common.py""" | 6 """Unit tests for git_common.py""" |
7 | 7 |
8 import binascii | 8 import binascii |
9 import collections | 9 import collections |
10 import os | 10 import os |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 self.assertEquals(self.repo.run(self.gc.upstream, 'bobly'), None) | 365 self.assertEquals(self.repo.run(self.gc.upstream, 'bobly'), None) |
366 self.assertEquals(self.repo.run(self.gc.upstream, 'master'), None) | 366 self.assertEquals(self.repo.run(self.gc.upstream, 'master'), None) |
367 self.repo.git('checkout', '-tb', 'happybranch', 'master') | 367 self.repo.git('checkout', '-tb', 'happybranch', 'master') |
368 self.assertEquals(self.repo.run(self.gc.upstream, 'happybranch'), | 368 self.assertEquals(self.repo.run(self.gc.upstream, 'happybranch'), |
369 'master') | 369 'master') |
370 | 370 |
371 def testNormalizedVersion(self): | 371 def testNormalizedVersion(self): |
372 self.assertTrue(all( | 372 self.assertTrue(all( |
373 isinstance(x, int) for x in self.repo.run(self.gc.get_git_version))) | 373 isinstance(x, int) for x in self.repo.run(self.gc.get_git_version))) |
374 | 374 |
| 375 @unittest.expectedFailure |
375 def testGetBranchesInfo(self): | 376 def testGetBranchesInfo(self): |
376 self.repo.git('commit', '--allow-empty', '-am', 'foooooo') | 377 self.repo.git('commit', '--allow-empty', '-am', 'foooooo') |
377 self.repo.git('checkout', '-tb', 'happybranch', 'master') | 378 self.repo.git('checkout', '-tb', 'happybranch', 'master') |
378 self.repo.git('commit', '--allow-empty', '-am', 'foooooo') | 379 self.repo.git('commit', '--allow-empty', '-am', 'foooooo') |
379 self.repo.git('checkout', '-tb', 'child', 'happybranch') | 380 self.repo.git('checkout', '-tb', 'child', 'happybranch') |
380 | 381 |
381 self.repo.git('checkout', '-tb', 'to_delete', 'master') | 382 self.repo.git('checkout', '-tb', 'to_delete', 'master') |
382 self.repo.git('checkout', '-tb', 'parent_gone', 'to_delete') | 383 self.repo.git('checkout', '-tb', 'parent_gone', 'to_delete') |
383 self.repo.git('branch', '-D', 'to_delete') | 384 self.repo.git('branch', '-D', 'to_delete') |
384 | 385 |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 | 705 |
705 self.assertEquals(self.repo.git('status', '--porcelain').stdout, STATUS_1) | 706 self.assertEquals(self.repo.git('status', '--porcelain').stdout, STATUS_1) |
706 | 707 |
707 self.repo.run(inner) | 708 self.repo.run(inner) |
708 | 709 |
709 | 710 |
710 if __name__ == '__main__': | 711 if __name__ == '__main__': |
711 sys.exit(coverage_utils.covered_main( | 712 sys.exit(coverage_utils.covered_main( |
712 os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py') | 713 os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py') |
713 )) | 714 )) |
OLD | NEW |