valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add list_worktrees tests

Browse Source
This commit is contained in:
Erik Johnson 2015-08-19 19:09:59 -05:00
parent 4c87aedb9c
commit 43fef21907
1 changed files with 76 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
tests/integration/modules/git.py
View File

@ -864,21 +864,24 @@ class GitModuleTest(integration.ModuleCase):
@skipIf(not _worktrees_supported(), @skipIf(not _worktrees_supported(),
'Git 2.5 or newer required for worktree support') 'Git 2.5 or newer required for worktree support')
def test_worktree(self): def test_worktrees(self):
''' '''
This tests git.worktree_add, git.is_worktree, git.worktree_rm, and This tests git.worktree_add, git.is_worktree, git.list_worktrees,
git.worktree_prune git.worktree_rm, and git.worktree_prune
''' '''
worktree_name = 'hotfix'
worktree_path = tempfile.mkdtemp(dir=integration.TMP) worktree_path = tempfile.mkdtemp(dir=integration.TMP)
worktree_basename = os.path.basename(worktree_path) worktree_basename = os.path.basename(worktree_path)
# Add a new worktree worktree_path2 = tempfile.mkdtemp(dir=integration.TMP)
worktree_basename2 = os.path.basename(worktree_path2)
# Add the worktrees
ret = self.run_function( ret = self.run_function(
'git.worktree_add', 'git.worktree_add', [self.repo, worktree_path],
[self.repo, worktree_path],
branch=worktree_name
) )
self.assertTrue('Enter ' + worktree_path in ret) self.assertTrue('Enter ' + worktree_path in ret)
ret = self.run_function(
'git.worktree_add', [self.repo, worktree_path2]
)
self.assertTrue('Enter ' + worktree_path2 in ret)
# Check if this new path is a worktree # Check if this new path is a worktree
self.assertTrue(self.run_function('git.is_worktree', [worktree_path])) self.assertTrue(self.run_function('git.is_worktree', [worktree_path]))
# Check if the main repo is a worktree # Check if the main repo is a worktree
@ -887,13 +890,56 @@ class GitModuleTest(integration.ModuleCase):
empty_dir = tempfile.mkdtemp(dir=integration.TMP) empty_dir = tempfile.mkdtemp(dir=integration.TMP)
self.assertFalse(self.run_function('git.is_worktree', [empty_dir])) self.assertFalse(self.run_function('git.is_worktree', [empty_dir]))
shutil.rmtree(empty_dir) shutil.rmtree(empty_dir)
# Remove the worktree # Both worktrees should show up here
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo]),
{os.path.basename(worktree_path): worktree_path,
os.path.basename(worktree_path2): worktree_path2}
)
# There should be no stale worktrees right now
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo], stale=True),
{}
)
# Both worktrees should show in the all=True output
self.assertEqual(
self.run_function(
'git.list_worktrees',
[self.repo],
**{'all': True}
),
{os.path.basename(worktree_path): worktree_path,
os.path.basename(worktree_path2): worktree_path2}
)
# Remove the first worktree
self.assertTrue(self.run_function('git.worktree_rm', [worktree_path])) self.assertTrue(self.run_function('git.worktree_rm', [worktree_path]))
# The first worktree should no longer show up here
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo]),
{os.path.basename(worktree_path2): worktree_path2}
)
# The first worktree should be identified as stale now
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo], stale=True),
{os.path.basename(worktree_path): worktree_path}
)
# Both worktrees should show in the all=True output
self.assertEqual(
self.run_function(
'git.list_worktrees',
[self.repo],
**{'all': True}
),
{os.path.basename(worktree_path): worktree_path,
os.path.basename(worktree_path2): worktree_path2}
)
# Prune the worktrees # Prune the worktrees
prune_message = ( prune_message = (
'Removing worktrees/{0}: gitdir file points to non-existent ' 'Removing worktrees/{0}: gitdir file points to non-existent '
'location'.format(worktree_basename) 'location'.format(worktree_basename)
) )
# Test dry run output. It should match the same output we get when we
# actually prune the worktrees.
self.assertEqual( self.assertEqual(
self.run_function( self.run_function(
'git.worktree_prune', 'git.worktree_prune',
@ -906,6 +952,27 @@ class GitModuleTest(integration.ModuleCase):
self.run_function('git.worktree_prune', [self.repo]), self.run_function('git.worktree_prune', [self.repo]),
prune_message prune_message
) )
# The first worktree should still no longer show up here
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo]),
{os.path.basename(worktree_path2): worktree_path2}
)
# The first worktree should no loner be identified as stale, since it
# was just pruned.
self.assertEqual(
self.run_function('git.list_worktrees', [self.repo], stale=True),
{}
)
# Only the second worktree should still show in the all=True output,
# since the first was pruned.
self.assertEqual(
self.run_function(
'git.list_worktrees',
[self.repo],
**{'all': True}
),
{os.path.basename(worktree_path2): worktree_path2}
)
if __name__ == '__main__': if __name__ == '__main__':