gnu: fabric: Enable tests.
* gnu/packages/patches/fabric-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (fabric)[source]: Use it. [native-inputs]: Add PYTHON2-FUDGE, PYTHON2-JINJA2 and PYTHON2-NOSE. [arguments]<#:tests>: Remove. Signed-off-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
		
							parent
							
								
									16fe516e78
								
							
						
					
					
						commit
						1b5b24c92d
					
				
					 3 changed files with 27 additions and 7 deletions
				
			
		|  | @ -552,6 +552,7 @@ dist_patch_DATA =						\ | ||||||
|   %D%/packages/patches/eudev-conflicting-declaration.patch	\
 |   %D%/packages/patches/eudev-conflicting-declaration.patch	\
 | ||||||
|   %D%/packages/patches/evilwm-lost-focus-bug.patch		\
 |   %D%/packages/patches/evilwm-lost-focus-bug.patch		\
 | ||||||
|   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch	\
 |   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch	\
 | ||||||
|  |   %D%/packages/patches/fabric-tests.patch			\
 | ||||||
|   %D%/packages/patches/fastcap-mulGlobal.patch			\
 |   %D%/packages/patches/fastcap-mulGlobal.patch			\
 | ||||||
|   %D%/packages/patches/fastcap-mulSetup.patch			\
 |   %D%/packages/patches/fastcap-mulSetup.patch			\
 | ||||||
|   %D%/packages/patches/fasthenry-spAllocate.patch		\
 |   %D%/packages/patches/fasthenry-spAllocate.patch		\
 | ||||||
|  |  | ||||||
|  | @ -12,10 +12,10 @@ | ||||||
| ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> | ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> | ||||||
| ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> | ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> | ||||||
| ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> | ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> | ||||||
| ;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> | ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> | ||||||
| ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> | ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> | ||||||
| ;;; Coypright © 2016 John Darrington <jmd@gnu.org> | ;;; Copyright © 2016 John Darrington <jmd@gnu.org> | ||||||
| ;;; Coypright © 2017 Ben Sturmfels <ben@sturm.com.au> | ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> | ||||||
| ;;; | ;;; | ||||||
| ;;; This file is part of GNU Guix. | ;;; This file is part of GNU Guix. | ||||||
| ;;; | ;;; | ||||||
|  | @ -2060,11 +2060,15 @@ Intel DRM Driver.") | ||||||
|        (uri (pypi-uri "Fabric" version)) |        (uri (pypi-uri "Fabric" version)) | ||||||
|        (sha256 |        (sha256 | ||||||
|         (base32 |         (base32 | ||||||
|          "1z17hw0yiqp1blq217zxkg2jzkv8qd79saqhscgsw14mwlcqpwd0")))) |          "1z17hw0yiqp1blq217zxkg2jzkv8qd79saqhscgsw14mwlcqpwd0")) | ||||||
|  |        (patches (search-patches "fabric-tests.patch")))) | ||||||
|     (build-system python-build-system) |     (build-system python-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:tests? #f     ;XXX: Tests attempt to download Python "fudge" package. |      `(#:python ,python-2))                       ;Python 2 only | ||||||
|        #:python ,python-2))                       ;Python 2 only |     (native-inputs | ||||||
|  |      `(("python2-fudge" ,python2-fudge) ; Requires < 1.0 | ||||||
|  |        ("python2-jinja2" ,python2-jinja2) ; Requires < 3.0 | ||||||
|  |        ("python2-nose" ,python2-nose))) ; Requires < 2.0 | ||||||
|     (propagated-inputs |     (propagated-inputs | ||||||
|      ;; Required upgrading python-paramiko 1.17.4 to fix an incompatibility |      ;; Required upgrading python-paramiko 1.17.4 to fix an incompatibility | ||||||
|      ;; between python-paramiko and newer python-pycrypto. Without this, the |      ;; between python-paramiko and newer python-pycrypto. Without this, the | ||||||
|  |  | ||||||
							
								
								
									
										15
									
								
								gnu/packages/patches/fabric-tests.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								gnu/packages/patches/fabric-tests.patch
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,15 @@ | ||||||
|  | The `fab` excecutable doesn't exist during the test phase as it is created | ||||||
|  | dynamically during installation. Refer to the equivalent Python module | ||||||
|  | directly. | ||||||
|  | 
 | ||||||
|  | --- a/tests/test_utils.py
 | ||||||
|  | +++ b/tests/test_utils.py
 | ||||||
|  | @@ -93,7 +93,7 @@
 | ||||||
|  |      # perform when they are allowed to bubble all the way to the top. So, we | ||||||
|  |      # invoke a subprocess and look at its stderr instead. | ||||||
|  |      with quiet(): | ||||||
|  | -        result = local("fab -f tests/support/aborts.py kaboom", capture=True)
 | ||||||
|  | +        result = local("python -m fabric -f tests/support/aborts.py kaboom", capture=True)
 | ||||||
|  |      # When error in #1318 is present, this has an extra "It burns!" at end of | ||||||
|  |      # stderr string. | ||||||
|  |      eq_(result.stderr, "Fatal error: It burns!\n\nAborting.") | ||||||
		Reference in a new issue