Author: salimma Update of /cvs/free/rpms/miro/F-17 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19205/F-17 Modified Files: miro-4.0.2-change_timeout.patch miro.spec Added Files: miro-4.0.6-terminate_dbus.patch Log Message: * Fri Mar 2 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 4.0.6-3 - Apply upstream patch for terminating DBus after running unit tests miro-4.0.6-terminate_dbus.patch: test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- NEW FILE miro-4.0.6-terminate_dbus.patch --- From: Ben Dean-Kawamura <ben(a)pculture.org&gt; Date: Tue, 8 Nov 2011 15:35:29 -0500 Subject: [PATCH] Fix for killing dbus after running the unittests I rewrote the script and split things up rather than having one huge line. I'm not sure what the problem was before, but it was leaving me with an extra dbus process each time I ran the unittests. The new version works for me. --- tv/linux/test.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tv/linux/test.sh b/tv/linux/test.sh index 1cce3e7..9e42e4a 100755 --- a/tv/linux/test.sh +++ b/tv/linux/test.sh @@ -35,4 +35,8 @@ # this comes from http://www.estamos.de/blog/2009/05/08/running-syncevolution-as-cron-job/ # env `dbus-launch` sh -c 'trap "kill $DBUS_SESSION_BUS_PID" EXIT; ./run.sh --unittest utiltest > /home/pcf/test_output.txt 1>&2' || true -env `dbus-launch` bash -c "trap \"kill $DBUS_SESSION_BUS_PID\" EXIT; ./run.sh --unittest $1 $2 $3" + + +eval `dbus-launch --sh-syntax` +trap "kill $DBUS_SESSION_BUS_PID" EXIT +./run.sh --unittest $@ -- 1.7.9.1 miro-4.0.2-change_timeout.patch: subprocesstest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: miro-4.0.2-change_timeout.patch =================================================================== RCS file: /cvs/free/rpms/miro/F-17/miro-4.0.2-change_timeout.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- miro-4.0.2-change_timeout.patch 14 Feb 2012 10:52:01 -0000 1.2 +++ miro-4.0.2-change_timeout.patch 2 Mar 2012 14:27:39 -0000 1.3 @@ -18,7 +18,7 @@ EventLoopTest.tearDown(self) - def _wait_for_subprocess_ready(self, timeout=4.0): -+ def _wait_for_subprocess_ready(self, timeout=20.0): ++ def _wait_for_subprocess_ready(self, timeout=6.0): """Wait for the subprocess to startup.""" start = time.time() Index: miro.spec =================================================================== RCS file: /cvs/free/rpms/miro/F-17/miro.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- miro.spec 13 Feb 2012 10:56:03 -0000 1.1 +++ miro.spec 2 Mar 2012 14:27:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: miro Version: 4.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Internet TV Player Group: Applications/Multimedia @@ -24,6 +24,8 @@ # Use provided CFLAGS when building miro-segmenter # submitted: https://bugzilla.pculture.org/show_bug.cgi?id=18027 Patch4: miro-4.0.2.1-segmenter_cflags.patch +# terminate DBus after running unit tests +Patch5: miro-4.0.6-terminate_dbus.patch BuildRequires: python-devel BuildRequires: desktop-file-utils @@ -86,6 +88,7 @@ %patch2 -p2 %patch3 -p2 %patch4 -p2 +%patch5 -p2 # /Patches @@ -142,6 +145,9 @@ %changelog +* Fri Mar 2 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 4.0.6-3 +- Apply upstream patch for terminating DBus after running unit tests + * Wed Feb 8 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 4.0.6-2 - Add GPLv2 to license field (for miro-segmenter) - Remove old upgrade path for Democracy package