13/37: gnu: python2-swiftclient: Enable tests.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 0ab4c3928502dd3621c9a4592295a48ad7cee4ee
Author: Marius Bakke <address@hidden>
Date:   Tue Feb 27 23:27:58 2018 +0100

    gnu: python2-swiftclient: Enable tests.
    
    * gnu/packages/openstack.scm (python-swiftclient)[properties]: Declare 
python2
    variant.
    (python2-swiftclient): Use STRIP-PYTHON2-VARIANT.
    [propagated-inputs]: Remove PYTHON2-REQUESTS.
    [arguments]: Remove.
    [native-inputs]: Delete.
---
 gnu/packages/openstack.scm | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index be1927d..bcd0754 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -844,25 +844,16 @@ data that best fit this type of storage model are virtual 
machine images, photo
 storage, email storage and backup archiving.  Having no central \"brain\" or
 master point of control provides greater scalability, redundancy and
 permanence.")
-  (license asl2.0)))
+    (properties `((python2-variant . ,(delay python2-swiftclient))))
+    (license asl2.0)))
 
 (define-public python2-swiftclient
-  (let ((swiftclient (package-with-python2 python-swiftclient)))
+  (let ((swiftclient (package-with-python2
+                      (strip-python2-variant python-swiftclient))))
     (package (inherit swiftclient)
-      (arguments
-       `(#:python ,python-2
-         ;; FIXME: subunit.run discover: error: no such option: --list
-         #:tests? #f))
       (propagated-inputs
        `(("python2-futures" ,python2-futures)
-         ("python2-requests" ,python2-requests)
-         ,@(alist-delete "python-requests"
-                         (package-propagated-inputs swiftclient))))
-      (native-inputs
-       `(("python2-keystoneclient" ,python2-keystoneclient)
-         ("python2-oslosphinx" ,python2-oslosphinx)
-         ,@(fold alist-delete (package-native-inputs swiftclient)
-            '("python-keystoneclient" "python-oslosphinx")))))))
+         ,@(package-propagated-inputs swiftclient))))))
 
 (define-public python-git-review
   (package