Tests use 'api rtp' to avoid (harmless) error message

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index be454354b3e2a799c19c0262be043b715d0c2442..d2bb20111e86adda41f63b1445476142f33e4361 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -3,20 +3,18 @@
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This file is part of DisOrder.
 # Copyright (C) 2007, 2008 Richard Kettlewell
 #

-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 #
 # (at your option) any later version.
 #

-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #
 
 """Utility module used by tests"""
 #
 
 """Utility module used by tests"""


@@ -192,7 +190,7 @@ tracklength *.mp3 disorder-tracklength
 tracklength *.ogg disorder-tracklength
 tracklength *.wav disorder-tracklength
 tracklength *.flac disorder-tracklength
 tracklength *.ogg disorder-tracklength
 tracklength *.wav disorder-tracklength
 tracklength *.flac disorder-tracklength

-api network
+api rtp

 broadcast 127.0.0.1 %d
 broadcast_from 127.0.0.1 %d
 mail_sender no.such.user.sorry@greenend.org.uk
 broadcast 127.0.0.1 %d
 broadcast_from 127.0.0.1 %d
 mail_sender no.such.user.sorry@greenend.org.uk


@@ -294,6 +292,8 @@ Stop the daemon if it has not stopped already"""
     else:
         print "  daemon already stopped"
     daemon = None
     else:
         print "  daemon already stopped"
     daemon = None

+    # Wait a bit for subprocess to finish too, to try to avoid stupid races
+    time.sleep(2)

 
 def run(module=None, report=True):
     """dtest.run(MODULE)
 
 def run(module=None, report=True):
     """dtest.run(MODULE)