test, #519: FIX appveyor conda & failures in py2.6 `assertRaisesRegexp` · og-python-scripts/GitPython@fa70623 · GitHub

1. og-python-scripts
2. GitPython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit fa70623

Browse filesBrowse the repository at this point in the historyBrowse files

ankostis

committed

test, gitpython-developers#519: FIX appveyor conda & failures in py2.6 assertRaisesRegexp

1 parent 7ec2f8a commit fa70623
Copy full SHA for fa70623

5 files changed

+22-12Lines changed: 22 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .appveyor.yml
• .travis.yml
• git/test
  • test_git.py
  • test_index.py
  • test_repo.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.appveyor.yml‎

Copy file name to clipboardExpand all lines: .appveyor.yml

+8-5Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -6,17 +6,19 @@ environment:
6	6	PYTHON_VERSION: "2.7"
7	7	- PYTHON: "C:\\Miniconda"
8	8	PYTHON_VERSION: "2.7"
	9	+ IS_CONDA: "yes"
9	10	GIT_PATH: "C:\\cygwin\\bin"
10	11
11	12	- PYTHON: "C:\\Miniconda3-x64"
12	13	PYTHON_VERSION: "3.4"
	14	+ IS_CONDA: "yes"
13	15	- PYTHON: "C:\\Python34"
14	16	PYTHON_VERSION: "3.4"
15	17	GIT_PATH: "C:\\cygwin64\\bin"
16	18
17		- - PYTHON: "C:\Python35-x64"
	19	+ - PYTHON: "C:\\Python35-x64"
18	20	PYTHON_VERSION: "3.5"
19		- - PYTHON: "C:\Python35-x64"
	21	+ - PYTHON: "C:\\Python35-x64"
20	22	PYTHON_VERSION: "3.5"
21	23	GIT_PATH: "C:\\cygwin64\\bin"
22	24
@@ -28,12 +30,13 @@ install:
28	30	- |
29	31	uname -a
30	32	where git
	33	+ where python pip pip2 pip3 pip34 pip35 pip36
31	34	python --version
32	35	python -c "import struct; print(struct.calcsize('P') * 8)"
33	36
34		- - IF EXIST "%PYTHON%\conda.exe" (
	37	+ - IF "%IS_CONDA%"=="yes" (
35	38	conda info -a &
36		- conda install --yes --quiet pip
	39	+ conda install --yes --quiet pip
37	40	)
38	41	- pip install nose wheel coveralls
39	42	- IF "%PYTHON_VERSION%"=="2.7" (
@@ -59,7 +62,7 @@ install:
59	62
60	63	- python setup.py develop
61	64
62		- build: off
	65	+ build: false
63	66
64	67	test_script:
65	68	- "nosetests -v"

Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml

+3-2Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -32,7 +32,8 @@ script:
32	32	- ulimit -n 96
33	33	- ulimit -n
34	34	- 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	+ -
37	38	after_success:
38	39	- coveralls

Collapse file

‎git/test/test_git.py‎

Copy file name to clipboardExpand all lines: git/test/test_git.py

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -239,7 +239,6 @@ def counter_stderr(line):
239	239	stdout=subprocess.PIPE,
240	240	stderr=subprocess.PIPE,
241	241	shell=False,
242		- creationflags=Git.CREATE_NO_WINDOW if sys.platform == 'win32' else 0,
243	242	)
244	243
245	244	handle_process_output(proc, counter_stdout, counter_stderr, lambda proc: proc.wait())

Collapse file

‎git/test/test_index.py‎

Copy file name to clipboardExpand all lines: git/test/test_index.py

+7-3Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -135,7 +135,7 @@ def _cmp_tree_index(self, tree, index):
135	135	raise AssertionError("CMP Failed: Missing entries in index: %s, missing in tree: %s" %
136	136	(bset - iset, iset - bset))
137	137	# END assertion message
138		-
	138	+
139	139	@with_rw_repo('0.1.6')
140	140	def test_index_lock_handling(self, rw_repo):
141	141	def add_bad_blob():
@@ -147,7 +147,8 @@ def add_bad_blob():
147	147	except Exception as ex:
148	148	msg_py3 = "required argument is not an integer"
149	149	msg_py2 = "cannot convert argument to integer"
150		- assert msg_py2 in str(ex) or msg_py3 in str(ex)
	150	+ ## msg_py26 ="unsupported operand type(s) for &: 'str' and 'long'"
	151	+ assert msg_py2 in str(ex) or msg_py3 in str(ex), str(ex)
151	152
152	153	## 2nd time should not fail due to stray lock file
153	154	try:
@@ -157,6 +158,9 @@ def add_bad_blob():
157	158
158	159	@with_rw_repo('0.1.6')
159	160	def test_index_file_from_tree(self, rw_repo):
	161	+ if sys.version_info < (2, 7):
	162	+ ## Skipped, not `assertRaisesRegexp` in py2.6
	163	+ return
160	164	common_ancestor_sha = "5117c9c8a4d3af19a9958677e45cda9269de1541"
161	165	cur_sha = "4b43ca7ff72d5f535134241e7c797ddc9c7a3573"
162	166	other_sha = "39f85c4358b7346fee22169da9cad93901ea9eb9"
@@ -576,7 +580,7 @@ def mixed_iterator():
576	580	if sys.platform != "win32":
577	581	for target in ('/etc/nonexisting', '/etc/passwd', '/etc'):
578	582	basename = "my_real_symlink"
579		-
	583	+
580	584	link_file = os.path.join(rw_repo.working_tree_dir, basename)
581	585	os.symlink(target, link_file)
582	586	entries = index.reset(new_commit).add([link_file], fprogress=self._fprogress_add)

Collapse file

‎git/test/test_repo.py‎

Copy file name to clipboardExpand all lines: git/test/test_repo.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -110,7 +110,7 @@ def test_tree_from_revision(self):
110	110
111	111	# try from invalid revision that does not exist
112	112	self.failUnlessRaises(BadName, self.rorepo.tree, 'hello world')
113		-
	113	+
114	114	def test_pickleable(self):
115	115	pickle.loads(pickle.dumps(self.rorepo))
116	116
@@ -318,6 +318,9 @@ def test_archive(self):
318	318
319	319	@patch.object(Git, '_call_process')
320	320	def test_should_display_blame_information(self, git):
	321	+ if sys.version_info < (2, 7):
	322	+ ## Skipped, not `assertRaisesRegexp` in py2.6
	323	+ return
321	324	git.return_value = fixture('blame')
322	325	b = self.rorepo.blame('master', 'lib/git.py')
323	326	assert_equal(13, len(b))

0 commit comments

Comments

0 (0)