Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit29eb301

Browse files
committed
win,#519: proc.terminate() instead of kill(SIGTERM)
+ test_diff: replace asserts with unittest-asserts.
1 parent45f8f20 commit29eb301

File tree

2 files changed

+41
-39
lines changed

2 files changed

+41
-39
lines changed

‎git/test/lib/helper.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def remote_repo_creator(self):
219219
# Of course we expect it to work here already, but maybe there are timing constraints
220220
# on some platforms ?
221221
ifgdisnotNone:
222-
os.kill(gd.proc.pid,15)
222+
gd.proc.terminate()
223223
log.warning('git-ls-remote failed due to: %s(%s)',type(e),e)
224224
ifos.name=='nt':
225225
msg="git-daemon needs to run this test, but windows does not have one. "
@@ -246,9 +246,8 @@ def remote_repo_creator(self):
246246
repo_dir=remote_repo_dir=None
247247
raise
248248
finally:
249-
# gd.proc.kill() ... no idea why that doesn't work
250249
ifgdisnotNone:
251-
os.kill(gd.proc.pid,15)
250+
gd.proc.terminate()
252251

253252
os.chdir(prev_cwd)
254253
rw_repo.git.clear_cache()

‎git/test/test_diff.py

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ def test_diff_with_staged_file(self, rw_dir):
7070
self.failUnlessRaises(GitCommandError,r.git.cherry_pick,'master')
7171

7272
# Now do the actual testing - this should just work
73-
assertlen(r.index.diff(None))==2
73+
self.assertEqual(len(r.index.diff(None)),2)
7474

75-
assertlen(r.index.diff(None,create_patch=True))==0,"This should work, but doesn't right now ... it's OK"
75+
self.assertEqual(len(r.index.diff(None,create_patch=True)),0,
76+
"This should work, but doesn't right now ... it's OK")
7677

7778
deftest_list_from_string_new_mode(self):
7879
output=StringProcessAdapter(fixture('diff_new_mode'))
@@ -100,41 +101,43 @@ def test_diff_with_rename(self):
100101

101102
output=StringProcessAdapter(fixture('diff_rename_raw'))
102103
diffs=Diff._index_from_raw_format(self.rorepo,output.stdout)
103-
assertlen(diffs)==1
104+
self.assertEqual(len(diffs),1)
104105
diff=diffs[0]
105-
assertdiff.renamed_file
106-
assertdiff.renamed
107-
assertdiff.rename_from=='this'
108-
assertdiff.rename_to=='that'
109-
assertlen(list(diffs.iter_change_type('R')))==1
106+
self.assertIsNotNone(diff.renamed_file)
107+
self.assertIsNotNone(diff.renamed)
108+
self.assertEqual(diff.rename_from,'this')
109+
self.assertEqual(diff.rename_to,'that')
110+
self.assertEqual(len(list(diffs.iter_change_type('R'))),1)
110111

111112
deftest_diff_of_modified_files_not_added_to_the_index(self):
112113
output=StringProcessAdapter(fixture('diff_abbrev-40_full-index_M_raw_no-color'))
113114
diffs=Diff._index_from_raw_format(self.rorepo,output.stdout)
114115

115-
assertlen(diffs)==1,'one modification'
116-
assertlen(list(diffs.iter_change_type('M')))==1,'one modification'
117-
assertdiffs[0].change_type=='M'
118-
assertdiffs[0].b_blobisNone
116+
self.assertEqual(len(diffs),1,'one modification')
117+
self.assertEqual(len(list(diffs.iter_change_type('M'))),1,'one modification')
118+
self.assertEqual(diffs[0].change_type,'M')
119+
self.assertIsNone(diffs[0].b_blob,)
119120

120121
deftest_binary_diff(self):
121122
formethod,file_namein ((Diff._index_from_patch_format,'diff_patch_binary'),
122123
(Diff._index_from_raw_format,'diff_raw_binary')):
123124
res=method(None,StringProcessAdapter(fixture(file_name)).stdout)
124-
assertlen(res)==1
125-
assertlen(list(res.iter_change_type('M')))==1
125+
self.assertEqual(len(res),1)
126+
self.assertEqual(len(list(res.iter_change_type('M'))),1)
126127
ifres[0].diff:
127-
assertres[0].diff==b"Binary files a/rps and b/rps differ\n","in patch mode, we get a diff text"
128-
assertstr(res[0]),"This call should just work"
128+
self.assertEqual(res[0].diff,
129+
b"Binary files a/rps and b/rps differ\n",
130+
"in patch mode, we get a diff text")
131+
self.assertIsNotNone(str(res[0]),"This call should just work")
129132
# end for each method to test
130133

131134
deftest_diff_index(self):
132135
output=StringProcessAdapter(fixture('diff_index_patch'))
133136
res=Diff._index_from_patch_format(None,output.stdout)
134-
assertlen(res)==6
137+
self.assertEqual(len(res),6)
135138
fordrinres:
136-
assertdr.diff.startswith(b'@@')
137-
assertstr(dr),"Diff to string conversion should be possible"
139+
self.assertTrue(dr.diff.startswith(b'@@'),dr)
140+
self.assertIsNotNone(str(dr),"Diff to string conversion should be possible")
138141
# end for each diff
139142

140143
dr=res[3]
@@ -143,24 +146,24 @@ def test_diff_index(self):
143146
deftest_diff_index_raw_format(self):
144147
output=StringProcessAdapter(fixture('diff_index_raw'))
145148
res=Diff._index_from_raw_format(None,output.stdout)
146-
assertres[0].deleted_file
147-
assertres[0].b_pathisNone
149+
self.assertIsNotNone(res[0].deleted_file)
150+
self.assertIsNone(res[0].b_path,)
148151

149152
deftest_diff_initial_commit(self):
150153
initial_commit=self.rorepo.commit('33ebe7acec14b25c5f84f35a664803fcab2f7781')
151154

152155
# Without creating a patch...
153156
diff_index=initial_commit.diff(NULL_TREE)
154-
assertdiff_index[0].b_path=='CHANGES'
155-
assertdiff_index[0].new_file
156-
assertdiff_index[0].diff==''
157+
self.assertEqual(diff_index[0].b_path,'CHANGES')
158+
self.assertIsNotNone(diff_index[0].new_file)
159+
self.assertEqual(diff_index[0].diff,'')
157160

158161
# ...and with creating a patch
159162
diff_index=initial_commit.diff(NULL_TREE,create_patch=True)
160-
assertdiff_index[0].a_pathisNone,repr(diff_index[0].a_path)
161-
assertdiff_index[0].b_path=='CHANGES',repr(diff_index[0].b_path)
162-
assertdiff_index[0].new_file
163-
assertdiff_index[0].diff==fixture('diff_initial')
163+
self.assertIsNone(diff_index[0].a_path,repr(diff_index[0].a_path))
164+
self.assertEqual(diff_index[0].b_path,'CHANGES',repr(diff_index[0].b_path))
165+
self.assertIsNotNone(diff_index[0].new_file)
166+
self.assertEqual(diff_index[0].diff,fixture('diff_initial'))
164167

165168
deftest_diff_unsafe_paths(self):
166169
output=StringProcessAdapter(fixture('diff_patch_unsafe_paths'))
@@ -206,8 +209,8 @@ def test_diff_patch_format(self):
206209
deftest_diff_with_spaces(self):
207210
data=StringProcessAdapter(fixture('diff_file_with_spaces'))
208211
diff_index=Diff._index_from_patch_format(self.rorepo,data.stdout)
209-
assertdiff_index[0].a_pathisNone,repr(diff_index[0].a_path)
210-
assertdiff_index[0].b_path==u'file with spaces',repr(diff_index[0].b_path)
212+
self.assertIsNone(diff_index[0].a_path,repr(diff_index[0].a_path))
213+
self.assertEqual(diff_index[0].b_path,u'file with spaces',repr(diff_index[0].b_path))
211214

212215
deftest_diff_interface(self):
213216
# test a few variations of the main diff routine
@@ -236,12 +239,12 @@ def test_diff_interface(self):
236239
diff_set=set()
237240
diff_set.add(diff_index[0])
238241
diff_set.add(diff_index[0])
239-
assertlen(diff_set)==1
240-
assertdiff_index[0]==diff_index[0]
241-
assertnot(diff_index[0]!=diff_index[0])
242+
self.assertEqual(len(diff_set),1)
243+
self.assertEqual(diff_index[0],diff_index[0])
244+
self.assertFalse(diff_index[0]!=diff_index[0])
242245

243246
fordrindiff_index:
244-
assertstr(dr),"Diff to string conversion should be possible"
247+
self.assertIsNotNone(str(dr),"Diff to string conversion should be possible")
245248
# END diff index checking
246249
# END for each patch option
247250
# END for each path option
@@ -252,11 +255,11 @@ def test_diff_interface(self):
252255
# can iterate in the diff index - if not this indicates its not working correctly
253256
# or our test does not span the whole range of possibilities
254257
forkey,valueinassertion_map.items():
255-
assertvalue,"Did not find diff for %s"%key
258+
self.assertIsNotNone(value,"Did not find diff for %s"%key)
256259
# END for each iteration type
257260

258261
# test path not existing in the index - should be ignored
259262
c=self.rorepo.head.commit
260263
cp=c.parents[0]
261264
diff_index=c.diff(cp, ["does/not/exist"])
262-
assertlen(diff_index)==0
265+
self.assertEqual(len(diff_index),0)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp