summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInada Naoki <songofacandy@gmail.com>2019-04-11 08:53:49 (GMT)
committerGitHub <noreply@github.com>2019-04-11 08:53:49 (GMT)
commit57b1a2862a99677f09614e9e456d36aae9ddd87c (patch)
treea1310de3c8d8a0b0c22cd030cb77f463c39a18b1
parentadff01e81d291c698581eadd693caa43ae5c78ac (diff)
downloadcpython-57b1a2862a99677f09614e9e456d36aae9ddd87c.zip
cpython-57b1a2862a99677f09614e9e456d36aae9ddd87c.tar.gz
cpython-57b1a2862a99677f09614e9e456d36aae9ddd87c.tar.bz2
bpo-36597: fix random doctest failure (GH-12776)
-rw-r--r--.travis.yml30
-rw-r--r--Doc/library/weakref.rst2
2 files changed, 15 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 23f79d0..6d57ebb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,22 +56,20 @@ matrix:
- python -m pip install sphinx==1.8.2 blurb python-docs-theme
script:
- make check suspicious html SPHINXOPTS="-q -W -j4"
- # FIXME: bpo-36597: the doctest job fails because it fails
- # FIXME: for an unknown reason
- #- os: linux
- # language: c
- # compiler: clang
- # env: TESTING=doctest
- # addons:
- # apt:
- # packages:
- # - xvfb
- # before_script:
- # - ./configure
- # - make -j4
- # - make -C Doc/ PYTHON=../python venv
- # script:
- # xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest
+ - os: linux
+ language: c
+ compiler: clang
+ env: TESTING=doctest
+ addons:
+ apt:
+ packages:
+ - xvfb
+ before_script:
+ - ./configure
+ - make -j4
+ - make -C Doc/ PYTHON=../python venv
+ script:
+ xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest
- os: osx
language: c
compiler: clang
diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst
index 40bb06a..b9e887c 100644
--- a/Doc/library/weakref.rst
+++ b/Doc/library/weakref.rst
@@ -492,7 +492,7 @@ is still alive. For instance
>>> obj = Object()
>>> weakref.finalize(obj, print, "obj dead or exiting") #doctest:+ELLIPSIS
<finalize object at ...; for 'Object' at ...>
- >>> exit() #doctest:+SKIP
+ >>> del obj
obj dead or exiting