Commit 21a6187b authored by Jason Madden's avatar Jason Madden Committed by GitHub

Merge pull request #264 from zopefoundation/issue263

isAlive -> is_alive. Fixes #263
parents 5321ae13 b5ba0250
language: python language: python
sudo: false dist: xenial
matrix: python:
include: - 2.7
- os: linux - 3.4
python: pypy - 3.5
- os: linux - 3.6
python: pypy3 - 3.7
env: BUILOUT_OPTIONS=sphinx:eggs= - pypy
- os: linux - pypy3
python: 2.7
- os: linux
python: 3.4
- os: linux
python: 3.5
- os: linux
python: 3.6
- python: 3.7
dist: xenial
sudo: true
install: install:
- pip install -U pip - pip install -U pip
- pip install -U setuptools zc.buildout - pip install -U setuptools zc.buildout
......
...@@ -49,10 +49,16 @@ eggs = ...@@ -49,10 +49,16 @@ eggs =
${coverage-test:eggs} ${coverage-test:eggs}
interpreter = py interpreter = py
[sphinx_egg]
eggs = Sphinx
[sphinx_egg:python2 or python34]
eggs = Sphinx < 2
[sphinx] [sphinx]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
Sphinx ${sphinx_egg:eggs}
docutils docutils
ZODB ZODB
j1m.sphinxautointerface j1m.sphinxautointerface
......
...@@ -221,7 +221,7 @@ class MTStorage(object): ...@@ -221,7 +221,7 @@ class MTStorage(object):
for t in threads: for t in threads:
t.join(60) t.join(60)
for t in threads: for t in threads:
self.assertFalse(t.isAlive(), self.assertFalse(t.is_alive(),
"thread failed to finish in 60 seconds") "thread failed to finish in 60 seconds")
def check2ZODBThreads(self): def check2ZODBThreads(self):
......
...@@ -227,7 +227,7 @@ class PackableStorage(PackableStorageBase): ...@@ -227,7 +227,7 @@ class PackableStorage(PackableStorageBase):
for t in threads: for t in threads:
t.join(60) t.join(60)
liveness = [t.isAlive() for t in threads] liveness = [t.is_alive() for t in threads]
if True in liveness: if True in liveness:
# They should have finished by now. # They should have finished by now.
print('Liveness:', liveness) print('Liveness:', liveness)
...@@ -312,7 +312,7 @@ class PackableStorage(PackableStorageBase): ...@@ -312,7 +312,7 @@ class PackableStorage(PackableStorageBase):
timer = ElapsedTimer(time.time()) timer = ElapsedTimer(time.time())
thread = ClientThread(db, choices, NUM_LOOP_TRIP, timer, 0) thread = ClientThread(db, choices, NUM_LOOP_TRIP, timer, 0)
thread.start() thread.start()
while thread.isAlive(): while thread.is_alive():
db.pack(packt) db.pack(packt)
snooze() snooze()
packt = time.time() packt = time.time()
......
...@@ -177,7 +177,7 @@ class DBMethods(CacheTestBase): ...@@ -177,7 +177,7 @@ class DBMethods(CacheTestBase):
w = Worker(self) w = Worker(self)
w.start() w.start()
w.join(30) w.join(30)
if w.isAlive(): if w.is_alive():
self.fail("cacheMinimize still running after 30 seconds -- " self.fail("cacheMinimize still running after 30 seconds -- "
"almost certainly in an infinite loop") "almost certainly in an infinite loop")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment