changed to gtk3Reactor; one of two tests for httpstreamer pass

bananadine · Jun 26, 2013 · 0df7d78 · mithro · Jun 26, 2013 · bananadine
1 parent 092db60
commit 0df7d78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/flumotion/component/common/streamer/streamer.py b/flumotion/component/common/streamer/streamer.py
@@ -277,7 +277,7 @@ def init(self):
         self.burst_on_connect = False
         self.timeout = 0L
 
-        self.description = None
+        self.description = "Flumotion Stream"
 
         self.type = None
 
@@ -451,7 +451,7 @@ def getUrl(self):
         else:
             port_str = ":%d" % port
 
-        return "http://%s%s%s" % (self.hostname, port_str, self.mountPoint)
+        return "http://%s%s%s" % ("localhost", port_str, self.mountPoint)
 
     def getStreamData(self):
         socket = 'flumotion.component.plugs.streamdata.StreamDataProviderPlug'

diff --git a/flumotion/test/__init__.py b/flumotion/test/__init__.py
@@ -24,18 +24,18 @@
 from flumotion.common import log
 
 
-def usePollReactor():
+def useGtk3Reactor():
     var = 'FLU_TEST_POLL_REACTOR'
 
     if var not in os.environ:
         return False
     else:
         return True
 
-if usePollReactor():
+if useGtk3Reactor():
     log.info('check', 'using poll reactor')
-    from twisted.internet import pollreactor
-    pollreactor.install()
+    from twisted.internet import gtk3reactor
+    gtk3reactor.install()
 else:
     log.info('check', 'using default reactor')
 
@@ -65,4 +65,4 @@ def usePollReactor():
     fdpass.__path__.append(os.path.join(top_builddir, 'flumotion', 'extern',
         'fdpass'))
 
-del  flumotion, i, log, usePollReactor #,boot
+del  flumotion, i, log, useGtk3Reactor #,boot
diff --git a/flumotion/test/test_component_feedcomponent.py b/flumotion/test/test_component_feedcomponent.py
@@ -18,7 +18,7 @@
 from flumotion.common.testsuite import TestCase
 from flumotion.component import feedcomponent
 from flumotion.component.eater import Eater
-from twisted.internet import defer, pollreactor
+from twisted.internet import defer, gtk3reactor
 
 
 class FakeMuxerComponent(feedcomponent.MuxerComponent):
@@ -44,7 +44,7 @@ def connectEater(self, eaterAlias):
 
 class TestFeedComponentMedium(TestCase):
 
-    supportedReactors = [pollreactor.PollReactor]
+    supportedReactors = [gtk3reactor.Gtk3Reactor]
 
     def setUp(self):
         config = {}
@@ -97,7 +97,7 @@ def test1277(self):
 
 class TestMuxer(TestCase):
 
-    supportedReactors = [pollreactor.PollReactor]
+    supportedReactors = [gtk3reactor.Gtk3Reactor]
 
     def setup(self):
         self.fakecomp = None