Skip to content

Commit 1857365

Browse files
committed
fix test wrt py34, modernize tox.ini
1 parent c9b9977 commit 1857365

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test_apipkg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,12 @@ def test_initpkg_overwrite_doc(monkeypatch):
245245
def test_initpkg_not_transfers_not_existing_attrs(monkeypatch):
246246
mod = ModuleType('hello')
247247
mod.__file__ = "hello.py"
248+
assert not hasattr(mod, '__path__')
248249
monkeypatch.setitem(sys.modules, 'hello', mod)
249250
apipkg.initpkg('hello', {})
250251
newmod = sys.modules['hello']
251252
assert newmod != mod
252253
assert newmod.__file__ == py.path.local(mod.__file__)
253-
assert not hasattr(newmod, '__loader__')
254254
assert not hasattr(newmod, '__path__')
255255

256256

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[tox]
2-
envlist=py27,py26,py25,py24,py31,py32,jython
2+
envlist=py27,py26,py33,py34,jython
33

44
[tox:hudson]
55
sdistsrc={distshare}/apipkg-*
66

77
[testenv]
8-
commands=py.test --junitxml={envlogdir}/junit-{envname}.xml []
8+
commands=py.test []
99
deps=pytest
1010

1111
[testenv:jython]
12-
commands=py.test-jython --junitxml={envlogdir}/junit-{envname}.xml []
12+
commands=py.test-jython []

0 commit comments

Comments
 (0)