From bd6c0565b2947c58d951046ecfd4718489c9b515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 22:07:48 +0200 Subject: [PATCH 1/2] python39Packages.pbr: enable tests, adopt into openstack team --- .../python-modules/pbr/default.nix | 19 +++++-- pkgs/development/python-modules/pbr/tests.nix | 49 +++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/pbr/tests.nix diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9c69e2fea544..9c46e638fc44 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, callPackage +}: buildPythonPackage rec { pname = "pbr"; @@ -11,13 +16,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - # circular dependencies with fixtures + # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + pythonImportsCheck = [ "pbr" ]; meta = with lib; { - homepage = "http://docs.openstack.org/developer/pbr/"; - license = licenses.asl20; description = "Python Build Reasonableness"; + homepage = "https://github.com/openstack/pbr"; + license = licenses.asl20; + maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix new file mode 100644 index 000000000000..a1c57684ce46 --- /dev/null +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, git +, gnupg +, pbr +, mock +, sphinx +, stestr +, testresources +, testscenarios +, virtualenv +}: + +buildPythonPackage rec { + pname = "pbr"; + inherit (pbr) version; + + src = pbr.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pbr + git + gnupg + mock + sphinx + stestr + testresources + testscenarios + virtualenv + ]; + + checkPhase = '' + stestr run -e <(echo " + pbr.tests.test_core.TestCore.test_console_script_develop + pbr.tests.test_core.TestCore.test_console_script_install + pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument + pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + ") + ''; +} From 01bd54a0aa3f4f6ca23efbe0a9592fe578eefe16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 14 Sep 2021 13:54:10 +0200 Subject: [PATCH 2/2] python3Packages: rename passthru test for openstack team --- pkgs/development/python-modules/debtcollector/default.nix | 2 +- pkgs/development/python-modules/os-service-types/default.nix | 2 +- pkgs/development/python-modules/oslo-config/default.nix | 2 +- pkgs/development/python-modules/oslotest/default.nix | 2 +- pkgs/development/python-modules/pbr/default.nix | 2 +- pkgs/development/python-modules/stestr/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 75555569e235..df3d78394605 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "debtcollector" ]; diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix index 990af2ce6b9d..147685fb2b91 100644 --- a/pkgs/development/python-modules/os-service-types/default.nix +++ b/pkgs/development/python-modules/os-service-types/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "os_service_types" ]; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index fface886eb94..125481d1e026 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslo_config" ]; diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 66e06c8b3e72..aa646a08ee90 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslotest" ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9c46e638fc44..77e8d5c210a2 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "pbr" ]; diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 88259dc718e1..1e5f965a8026 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "stestr" ];