

def test_merge_base_and_tree(self):
    '\n        Test git.merge_base, git.merge_tree and git.revision\n\n        TODO: Test all of the arguments\n        '
    head_rev = self.run_function('git.revision', [self.repo], rev='HEAD')
    self.assertTrue((len(head_rev) == 40))
    second_rev = self.run_function('git.revision', [self.repo], rev=self.branches[1])
    self.assertTrue((len(second_rev) == 40))
    self.assertEqual(self.run_function('git.merge_base', [self.repo], refs=','.join((head_rev, second_rev))), head_rev)
    ret = self.run_function('git.merge_tree', [self.repo, head_rev, second_rev]).splitlines()
    self.assertTrue((len([x for x in self if x.startswith('@@')]) == 1))

dataset/ETHPy150Open saltstack/salt/tests/integration/modules/git.py GitModuleTest.test_merge_base_and_tree/VarMisuse@151/247 `ret`->`self`