summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2019-06-17 20:39:22 -0400
committerNed Batchelder <ned@nedbatchelder.com>2019-06-17 20:40:37 -0400
commit21bb447e266831ed44388d9fb9a5327effddee19 (patch)
tree47c185aca31f2ac2af17dcb9bd80cae67c14f9fe
parente463e440c52fd5a7073799397a963f43bcb47aaa (diff)
downloadpython-coveragepy-git-21bb447e266831ed44388d9fb9a5327effddee19.tar.gz
Remove ShiningPanda hack
-rw-r--r--CHANGES.rst7
-rw-r--r--coverage/html.py7
-rw-r--r--tests/test_html.py8
3 files changed, 6 insertions, 16 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 6b9bdede..275272ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -38,6 +38,11 @@ Unreleased
be reported as warnings. As with other warnings, you can suppress them with
the ``[run] disable_warnings`` configuration setting.
+- The hack to accommodate ShiningPanda_ looking for an obsolete internal data
+ file has been removed, since ShiningPanda 0.22 fixed it four years ago.
+
+.. _ShiningPanda: https://wiki.jenkins.io/display/JENKINS/ShiningPanda+Plugin
+
.. _changes_50a5:
@@ -989,7 +994,7 @@ Version 4.0b3 --- 2015-09-07
- Reporting on an unmeasured file would fail with a traceback. This is now
fixed, closing `issue 403`_.
-- The Jenkins ShiningPanda plugin looks for an obsolete file name to find the
+- The Jenkins ShiningPanda_ plugin looks for an obsolete file name to find the
HTML reports to publish, so it was failing under coverage.py 4.0. Now we
create that file if we are running under Jenkins, to keep things working
smoothly. `issue 404`_.
diff --git a/coverage/html.py b/coverage/html.py
index a5aed350..0ad56063 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -421,13 +421,6 @@ class IncrementalChecker(object):
with open(status_file, "w") as fout:
json.dump(status, fout, separators=(',', ':'))
- # Older versions of ShiningPanda look for the old name, status.dat.
- # Accommodate them if we are running under Jenkins.
- # https://issues.jenkins-ci.org/browse/JENKINS-28428
- if "JENKINS_URL" in os.environ:
- with open(os.path.join(self.directory, "status.dat"), "w") as dat:
- dat.write("https://issues.jenkins-ci.org/browse/JENKINS-28428\n")
-
def check_global_data(self, *data):
"""Check the global data that can affect incremental reporting."""
m = Hasher()
diff --git a/tests/test_html.py b/tests/test_html.py
index 9cd47882..2096e3e1 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -493,14 +493,6 @@ class HtmlTest(HtmlTestHelpers, CoverageTest):
self.assert_exists("htmlcov/index.html")
self.assert_exists("htmlcov/other_py.html")
- def test_shining_panda_fix(self):
- # The ShiningPanda plugin looks for "status.dat" to find HTML reports.
- # Accommodate them, but only if we are running under Jenkins.
- self.set_environ("JENKINS_URL", "Something or other")
- self.create_initial_files()
- self.run_coverage()
- self.assert_exists("htmlcov/status.dat")
-
def test_report_skip_covered_no_branches(self):
self.make_file("main_file.py", """
import not_covered