rpms/selenium-remote-control/devel selenium-remote-control-1.0.3-browserlog.patch, NONE, 1.1 selenium-remote-control.spec, 1.9, 1.10

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/selenium-remote-control/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9405

Modified Files:
	selenium-remote-control.spec 
Added Files:
	selenium-remote-control-1.0.3-browserlog.patch 
Log Message:
* Tue Apr 20 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.0.3-6.20100318svn
- Do not throw browser output away
- Enable python documentation formatting


selenium-remote-control-1.0.3-browserlog.patch:
 AsyncExecute.java |   34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

--- NEW FILE selenium-remote-control-1.0.3-browserlog.patch ---
>From 40642b91c25b0c81b58860f4a58b2c462ab9d860 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 20 Apr 2010 12:28:26 +0200
Subject: [PATCH] Do not throw browser output away

Log it instead (on warn level, good browsers don't scream too much).
---
 .../server/browserlaunchers/AsyncExecute.java      |   33 ++++++++++++++++++--
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/openqa/selenium/server/browserlaunchers/AsyncExecute.java b/src/main/java/org/openqa/selenium/server/browserlaunchers/AsyncExecute.java
index b3a9227..9bedb1d 100644
--- a/src/main/java/org/openqa/selenium/server/browserlaunchers/AsyncExecute.java
+++ b/src/main/java/org/openqa/selenium/server/browserlaunchers/AsyncExecute.java
@@ -90,12 +90,39 @@ public class AsyncExecute extends Execute {
             AsyncExecute.sleepTight(1000);
         }
 
-        OutputStream dummyOut = new OutputStream() {
-            public void write(int b) throws IOException {
+        OutputStream loggingOut = new OutputStream() {
+            String buffer = "";
+
+            public void flush ()
+            {
+                log.warn ("Browser: " + buffer);
+                buffer = "";
+            }
+
+            public void write (int b)
+            {
+                if ((char)b == '\n')
+                    flush ();
+                else
+                    buffer += (char)b;
+            }
+
+            /* This does not get called by PumpStreamHandler,
+             * since we throw away a reference to it. Bad. */
+            public void close ()
+            {
+                flush ();
+            }
+
+            /* Not a good idea to rely on this. */
+            protected void finalize () throws Throwable
+            {
+                close ();
+                super.finalize ();
             }
         };
 
-        ExecuteStreamHandler streamHandler = new PumpStreamHandler(dummyOut);
+        ExecuteStreamHandler streamHandler = new PumpStreamHandler(loggingOut);
         streamHandler.setProcessErrorStream(process.getErrorStream());
         streamHandler.setProcessOutputStream(process.getInputStream());
         streamHandler.start();
-- 
1.7.0.1



Index: selenium-remote-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selenium-remote-control/devel/selenium-remote-control.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- selenium-remote-control.spec	20 Apr 2010 07:23:55 -0000	1.9
+++ selenium-remote-control.spec	10 May 2010 09:56:54 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           selenium-remote-control
 Version:        1.0.3
-Release:        5.20100318svn%{?dist}
+Release:        6.20100318svn%{?dist}
 Summary:        Tool for remotely controlling a web browser to test a web site
 
 Group:          Development/Tools
@@ -19,6 +19,8 @@ Patch2:         selenium-remote-control-
 Patch10:        http://jira.openqa.org/secure/attachment/12212/selenium-safari-cleanup.patch
 # http://jira.openqa.org/browse/SRC-831
 Patch11:        http://jira.openqa.org/secure/attachment/12399/selenium-remote-control-1.0.3-chrome-quotes.patch
+# http://jira.openqa.org/browse/SRC-832
+Patch12:        http://jira.openqa.org/secure/attachment/12400/selenium-remote-control-1.0.3-browserlog.patch
 
 BuildRequires:  ant-trax
 BuildRequires:  jakarta-commons-codec
@@ -93,6 +95,7 @@ Install selenium-server package for the 
 cd server-coreless
 %patch10 -p1 -b .safari-cleanup
 %patch11 -p1 -b .chrome-quotes
+%patch12 -p1 -b .browserlog
 
 
 %build
@@ -155,11 +158,7 @@ unzip -qc $(build-classpath selenium-cor
 ant generate-sources
 # Generate documentation. Well...
 mkdir -p doc
-cat >doc/placeholder.txt <<EOF
-Documentation build is pending fix of
-https://bugzilla.redhat.com/show_bug.cgi?id=578920
-EOF
-# epydoc --simple-term selenium.py -o doc
+epydoc --simple-term selenium.py -o doc
 popd
 
 
@@ -249,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 20 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.0.3-6.20100318svn
+- Do not throw browser output away
+- Enable python documentation formatting
+
 * Tue Apr 20 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.0.3-5.20100318svn
 - Remove chrome argument quoting workaround
 - Fill in version and revision (Jiri Kastner, #581756)