rpms/python-paver/devel paver-easy-stderr-tests.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 python-paver.spec, 1.10, 1.11 sources, 1.5, 1.6

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19804/devel

Modified Files:
	.cvsignore python-paver.spec sources 
Added Files:
	paver-easy-stderr-tests.patch 
Log Message:

* Wed May 19 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.2-1
- Update to 1.0.2


paver-easy-stderr-tests.patch:
 test_easy.py |   26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

--- NEW FILE paver-easy-stderr-tests.patch ---
Index: Paver-1.0.2/paver/tests/test_easy.py
===================================================================
--- Paver-1.0.2.orig/paver/tests/test_easy.py
+++ Paver-1.0.2/paver/tests/test_easy.py
@@ -4,11 +4,10 @@ import subprocess # for easy.sh tests
 
 
 @patch(subprocess, "Popen")
- at patch(easy, "error")
-def test_sh_raises_BuildFailure(popen, error):
+def test_sh_raises_BuildFailure(popen):
     popen.return_value = Mock()
     popen.return_value.returncode = 1
-    popen.return_value.stderr.read.return_value = 'some stderr'
+    popen.return_value.stdout.read.return_value = 'some stderr'
 
     try:
         easy.sh('foo')
@@ -23,14 +22,12 @@ def test_sh_raises_BuildFailure(popen, e
     assert popen.call_args[1]['shell'] == True
     assert 'stdout' not in popen.call_args[1]
 
-    assert error.called
-    assert error.call_args == (('some stderr', ), {})
-
 @patch(subprocess, "Popen")
-def test_sh_with_capture_raises_BuildFailure(popen):
+ at patch(easy, "error")
+def test_sh_with_capture_raises_BuildFailure(popen, error):
     popen.return_value = Mock()
     popen.return_value.returncode = 1
-    popen.return_value.stderr.read.return_value = 'some stderr'
+    popen.return_value.stdout.read.return_value = 'some stderr'
     try:
         easy.sh('foo', capture=True)
     except easy.BuildFailure, e:
@@ -43,31 +40,32 @@ def test_sh_with_capture_raises_BuildFai
     assert popen.call_args[0][0] == 'foo'
     assert popen.call_args[1]['shell'] == True
     assert popen.call_args[1]['stdout'] == subprocess.PIPE
-    assert popen.call_args[1]['stderr'] == subprocess.PIPE
+    assert popen.call_args[1]['stderr'] == subprocess.STDOUT
+
+    assert error.called
+    assert error.call_args == (('some stderr', ), {})
 
 @patch(subprocess, "Popen")
 def test_sh_ignores_error(popen):
     popen.return_value = Mock()
     popen.return_value.returncode = 1
-    popen.return_value.stderr.read.return_value = 'some stderr'
+    popen.return_value.stdout.read.return_value = 'some stderr'
     easy.sh('foo', ignore_error=True)
 
     assert popen.called
     assert popen.call_args[0][0] == 'foo'
     assert popen.call_args[1]['shell'] == True
     assert 'stdout' not in popen.call_args[1]
-    assert popen.call_args[1]['stderr'] == subprocess.PIPE
-
 
 @patch(subprocess, "Popen")
 def test_sh_ignores_error_with_capture(popen):
     popen.return_value = Mock()
     popen.return_value.returncode = 1
-    popen.return_value.stderr.read.return_value = 'some stderr'
+    popen.return_value.stdout.read.return_value = 'some stderr'
     easy.sh('foo', capture=True, ignore_error=True)
 
     assert popen.called
     assert popen.call_args[0][0] == 'foo'
     assert popen.call_args[1]['shell'] == True
     assert popen.call_args[1]['stdout'] == subprocess.PIPE
-    assert popen.call_args[1]['stderr'] == subprocess.PIPE
+    assert popen.call_args[1]['stderr'] == subprocess.STDOUT


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Feb 2010 22:58:21 -0000	1.5
+++ .cvsignore	20 May 2010 02:07:36 -0000	1.6
@@ -1 +1 @@
-Paver-1.0.1.tar.gz
+Paver-1.0.2.tar.gz


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/devel/python-paver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-paver.spec	3 Feb 2010 22:58:21 -0000	1.10
+++ python-paver.spec	20 May 2010 02:07:37 -0000	1.11
@@ -2,7 +2,7 @@
 
 %define srcname Paver
 Name: python-paver
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
@@ -10,7 +10,7 @@ Group: Development/Languages
 License: BSD
 URL: http://www.blueskyonmars.com/projects/paver/
 Source0: http://pypi.python.org/packages/source/P/%{srcname}/%{srcname}-%{version}.tar.gz
-
+Patch0: paver-easy-stderr-tests.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -50,6 +50,7 @@ now much easier.
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .stderr
 
 # Note: This falls somewhere in between source and non-source.  It's a copy
 # of the essential files from the library that's being packaged.  But it's
@@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 19 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2
+
 * Wed Feb 03 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.1-1
 - Update to 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Feb 2010 22:58:21 -0000	1.5
+++ sources	20 May 2010 02:07:37 -0000	1.6
@@ -1 +1 @@
-f53d1d5ed6517e6def1926f7918a02ec  Paver-1.0.1.tar.gz
+c038b421e213c0c3506e3927baad23cb  Paver-1.0.2.tar.gz