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

Commitfa70623

Browse files
committed
test,#519: FIX appveyor conda & failures in py2.6assertRaisesRegexp
1 parent7ec2f8a commitfa70623

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

‎.appveyor.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@ environment:
66
PYTHON_VERSION:"2.7"
77
-PYTHON:"C:\\Miniconda"
88
PYTHON_VERSION:"2.7"
9+
IS_CONDA:"yes"
910
GIT_PATH:"C:\\cygwin\\bin"
1011

1112
-PYTHON:"C:\\Miniconda3-x64"
1213
PYTHON_VERSION:"3.4"
14+
IS_CONDA:"yes"
1315
-PYTHON:"C:\\Python34"
1416
PYTHON_VERSION:"3.4"
1517
GIT_PATH:"C:\\cygwin64\\bin"
1618

17-
-PYTHON:"C:\Python35-x64"
19+
-PYTHON:"C:\\Python35-x64"
1820
PYTHON_VERSION:"3.5"
19-
-PYTHON:"C:\Python35-x64"
21+
-PYTHON:"C:\\Python35-x64"
2022
PYTHON_VERSION:"3.5"
2123
GIT_PATH:"C:\\cygwin64\\bin"
2224

@@ -28,12 +30,13 @@ install:
2830
-|
2931
uname -a
3032
where git
33+
where python pip pip2 pip3 pip34 pip35 pip36
3134
python --version
3235
python -c "import struct; print(struct.calcsize('P') * 8)"
3336
34-
-IFEXIST "%PYTHON%\conda.exe" (
37+
-IF"%IS_CONDA%"=="yes" (
3538
conda info -a &
36-
conda install --yes --quiet pip
39+
conda install --yes --quietpip
3740
)
3841
-pip install nose wheel coveralls
3942
-IF "%PYTHON_VERSION%"=="2.7" (
@@ -59,7 +62,7 @@ install:
5962
6063
-python setup.py develop
6164

62-
build:off
65+
build:false
6366

6467
test_script:
6568
-"nosetests -v"

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ script:
3232
-ulimit -n 96
3333
-ulimit -n
3434
-nosetests -v --with-coverage
35-
-flake8
36-
-cd doc && make html
35+
-if [ "$TRAVIS_PYTHON_VERSION" != '2.6' ]; then flake8; fi
36+
-if [ "$TRAVIS_PYTHON_VERSION" != '2.6' ]; then cd doc && make html; fi
37+
-
3738
after_success:
3839
-coveralls

‎git/test/test_git.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ def counter_stderr(line):
239239
stdout=subprocess.PIPE,
240240
stderr=subprocess.PIPE,
241241
shell=False,
242-
creationflags=Git.CREATE_NO_WINDOWifsys.platform=='win32'else0,
243242
)
244243

245244
handle_process_output(proc,counter_stdout,counter_stderr,lambdaproc:proc.wait())

‎git/test/test_index.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def _cmp_tree_index(self, tree, index):
135135
raiseAssertionError("CMP Failed: Missing entries in index: %s, missing in tree: %s"%
136136
(bset-iset,iset-bset))
137137
# END assertion message
138-
138+
139139
@with_rw_repo('0.1.6')
140140
deftest_index_lock_handling(self,rw_repo):
141141
defadd_bad_blob():
@@ -147,7 +147,8 @@ def add_bad_blob():
147147
exceptExceptionasex:
148148
msg_py3="required argument is not an integer"
149149
msg_py2="cannot convert argument to integer"
150-
assertmsg_py2instr(ex)ormsg_py3instr(ex)
150+
## msg_py26 ="unsupported operand type(s) for &: 'str' and 'long'"
151+
assertmsg_py2instr(ex)ormsg_py3instr(ex),str(ex)
151152

152153
## 2nd time should not fail due to stray lock file
153154
try:
@@ -157,6 +158,9 @@ def add_bad_blob():
157158

158159
@with_rw_repo('0.1.6')
159160
deftest_index_file_from_tree(self,rw_repo):
161+
ifsys.version_info< (2,7):
162+
## Skipped, not `assertRaisesRegexp` in py2.6
163+
return
160164
common_ancestor_sha="5117c9c8a4d3af19a9958677e45cda9269de1541"
161165
cur_sha="4b43ca7ff72d5f535134241e7c797ddc9c7a3573"
162166
other_sha="39f85c4358b7346fee22169da9cad93901ea9eb9"
@@ -576,7 +580,7 @@ def mixed_iterator():
576580
ifsys.platform!="win32":
577581
fortargetin ('/etc/nonexisting','/etc/passwd','/etc'):
578582
basename="my_real_symlink"
579-
583+
580584
link_file=os.path.join(rw_repo.working_tree_dir,basename)
581585
os.symlink(target,link_file)
582586
entries=index.reset(new_commit).add([link_file],fprogress=self._fprogress_add)

‎git/test/test_repo.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test_tree_from_revision(self):
110110

111111
# try from invalid revision that does not exist
112112
self.failUnlessRaises(BadName,self.rorepo.tree,'hello world')
113-
113+
114114
deftest_pickleable(self):
115115
pickle.loads(pickle.dumps(self.rorepo))
116116

@@ -318,6 +318,9 @@ def test_archive(self):
318318

319319
@patch.object(Git,'_call_process')
320320
deftest_should_display_blame_information(self,git):
321+
ifsys.version_info< (2,7):
322+
## Skipped, not `assertRaisesRegexp` in py2.6
323+
return
321324
git.return_value=fixture('blame')
322325
b=self.rorepo.blame('master','lib/git.py')
323326
assert_equal(13,len(b))

0 commit comments

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