From b8a299c9102d28f7bb6890a80e383993ff7db3c5 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 7 Jan 2019 20:09:20 +0100
Subject: [PATCH] python.pkgs.entrypoints: simplify tests

The upstream issue requiring one test to be disabled was fixed:
https://github.com/takluyver/entrypoints/issues/23
---
 .../python-modules/entrypoints/default.nix           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index 466014715bac..77d20876fe15 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -4,7 +4,6 @@
 , configparser
 , pytest
 , isPy3k
-, isPy27
 }:
 
 buildPythonPackage rec {
@@ -20,15 +19,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = lib.optional (!isPy3k) configparser;
 
-  checkPhase = let
-    # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad
-    # test fails. It tests that a warning (exectly one) is thrown on a "bad"
-    # path. The pytest upgrade added some warning, resulting in two warnings
-    # being thrown.
-    # upstream: https://github.com/takluyver/entrypoints/issues/23
-    pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
-  in ''
-    py.test ${pyTestArgs} tests
+  checkPhase = ''
+    py.test tests
   '';
 
   meta = {