iframe-proxy | Sunbelt Computer Software

History

177 lines (127 loc) · 5.1 KB

Raw

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

168

169

170

171

172

173

174

175

176

177

# -*- coding: utf-8 -*-

from __future__ import absolute_import

from __future__ import unicode_literals

import os.path

import pytest

from pre_commit import git

from pre_commit.error_handler import FatalError

from pre_commit.util import cmd_output

from testing.fixtures import git_dir

from testing.util import cwd

def test_get_root_at_root(tempdir_factory):

path = git_dir(tempdir_factory)

with cwd(path):

assert os.path.normcase(git.get_root()) == os.path.normcase(path)

def test_get_root_deeper(tempdir_factory):

path = git_dir(tempdir_factory)

foo_path = os.path.join(path, 'foo')

os.mkdir(foo_path)

with cwd(foo_path):

assert os.path.normcase(git.get_root()) == os.path.normcase(path)

def test_get_root_not_git_dir(tempdir_factory):

with cwd(tempdir_factory.get()):

with pytest.raises(FatalError):

git.get_root()

def test_get_staged_files_deleted(tempdir_factory):

path = git_dir(tempdir_factory)

with cwd(path):

open('test', 'a').close()

cmd_output('git', 'add', 'test')

cmd_output('git', 'commit', '-m', 'foo', '--allow-empty')

cmd_output('git', 'rm', '--cached', 'test')

assert git.get_staged_files() == []

def test_is_not_in_merge_conflict(tempdir_factory):

path = git_dir(tempdir_factory)

with cwd(path):

assert git.is_in_merge_conflict() is False

def test_is_in_merge_conflict(in_merge_conflict):

assert git.is_in_merge_conflict() is True

def test_is_in_merge_conflict_submodule(in_conflicting_submodule):

assert git.is_in_merge_conflict() is True

def test_cherry_pick_conflict(in_merge_conflict):

cmd_output('git', 'merge', '--abort')

foo_ref = cmd_output('git', 'rev-parse', 'foo')[1].strip()

cmd_output('git', 'cherry-pick', foo_ref, retcode=None)

assert git.is_in_merge_conflict() is False

def resolve_conflict():

with open('conflict_file', 'w') as conflicted_file:

conflicted_file.write('herp\nderp\n')

cmd_output('git', 'add', 'conflict_file')

def test_get_conflicted_files(in_merge_conflict):

resolve_conflict()

with open('other_file', 'w') as other_file:

other_file.write('oh hai')

cmd_output('git', 'add', 'other_file')

ret = set(git.get_conflicted_files())

assert ret == {'conflict_file', 'other_file'}

def test_get_conflicted_files_in_submodule(in_conflicting_submodule):

resolve_conflict()

assert set(git.get_conflicted_files()) == {'conflict_file'}

def test_get_conflicted_files_unstaged_files(in_merge_conflict):

"""This case no longer occurs, but it is a useful test nonetheless"""

resolve_conflict()

# Make unstaged file.

with open('bar_only_file', 'w') as bar_only_file:

bar_only_file.write('new contents!\n')

ret = set(git.get_conflicted_files())

assert ret == {'conflict_file'}

MERGE_MSG = b"Merge branch 'foo' into bar\n\nConflicts:\n\tconflict_file\n"

OTHER_MERGE_MSG = MERGE_MSG + b'\tother_conflict_file\n'

@pytest.mark.parametrize(

('input', 'expected_output'),

(

(MERGE_MSG, ['conflict_file']),

(OTHER_MERGE_MSG, ['conflict_file', 'other_conflict_file']),

)

def test_parse_merge_msg_for_conflicts(input, expected_output):

ret = git.parse_merge_msg_for_conflicts(input)

assert ret == expected_output

def test_get_changed_files(in_tmpdir):

cmd_output('git', 'init', '.')

cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')

open('a.txt', 'a').close()

open('b.txt', 'a').close()

cmd_output('git', 'add', '.')

cmd_output('git', 'commit', '-m', 'add some files')

files = git.get_changed_files('HEAD', 'HEAD^')

assert files == ['a.txt', 'b.txt']

# files changed in source but not in origin should not be returned

files = git.get_changed_files('HEAD^', 'HEAD')

assert files == []

@pytest.mark.parametrize(

('s', 'expected'),

(

('foo\0bar\0', ['foo', 'bar']),

('foo\0', ['foo']),

('', []),

('foo', ['foo']),

)

def test_zsplit(s, expected):

assert git.zsplit(s) == expected

@pytest.fixture

def non_ascii_repo(tmpdir):

repo = tmpdir.join('repo').ensure_dir()

with repo.as_cwd():

cmd_output('git', 'init', '.')

cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')

repo.join('интервью').ensure()

cmd_output('git', 'add', '.')

cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')

yield repo

def test_all_files_non_ascii(non_ascii_repo):

ret = git.get_all_files()

assert ret == ['интервью']

def test_staged_files_non_ascii(non_ascii_repo):

non_ascii_repo.join('интервью').write('hi')

cmd_output('git', 'add', '.')

assert git.get_staged_files() == ['интервью']

def test_changed_files_non_ascii(non_ascii_repo):

ret = git.get_changed_files('HEAD', 'HEAD^')

assert ret == ['интервью']

def test_get_conflicted_files_non_ascii(in_merge_conflict):

open('интервью', 'a').close()

cmd_output('git', 'add', '.')

ret = git.get_conflicted_files()

assert ret == {'conflict_file', 'интервью'}

Sunbelt Computer Software

PL/B Language Development and Support

Navigation Menu

Sunbelt Computer Software

PL/B Language Development and Support

FilesExpand file tree

git_test.py

Latest commit

History

git_test.py

File metadata and controls