r6259 - in flumotion/trunk: . flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Wed Feb 20 13:49:36 2008
New Revision: 6259

Log:
2008-02-20  Johan Dahlin  <johan at gnome.org>

    * flumotion/test/test_component_httpserver.py 
    (MountTest.testDirMountEmpty, MountTest.properties): 
    Disable on pre twisted 2.5.0, to make buildbots happy.



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_component_httpserver.py

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Feb 20 13:49:36 2008
@@ -1,8 +1,13 @@
 2008-02-20  Johan Dahlin  <johan at gnome.org>
 
+	* flumotion/test/test_component_httpserver.py 
+	(MountTest.testDirMountEmpty, MountTest.properties): 
+	Disable on pre twisted 2.5.0, to make buildbots happy.
+
 	* flumotion/test/test_component_httpserver.py (MountTest): 
 	Chain deferred by using DeferredList with fireOnOneErroback enabled, half of
 	the tests before this change were actually failing.
+
 	* flumotion/component/misc/httpfile/httpfile.py
 	(HTTPFileStreamer._getDefaultRootResource): Do not strip the leading character,
 	it will be done later in _createRootResourceForPath().

Modified: flumotion/trunk/flumotion/test/test_component_httpserver.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_component_httpserver.py	(original)
+++ flumotion/trunk/flumotion/test/test_component_httpserver.py	Wed Feb 20 13:49:36 2008
@@ -22,6 +22,7 @@
 import os
 import tempfile
 
+from twisted import version
 from twisted.internet import defer
 from twisted.trial import unittest
 from twisted.web import client, error
@@ -33,8 +34,9 @@
 from flumotion.component.misc.httpfile import httpfile
 from flumotion.component.plugs.base import ComponentPlug
 
-__version__ = "$Rev$"
+usingOldTwisted = (version.major, version.minor, version.micro) < (2, 5, 0)
 
+__version__ = "$Rev$"
 
 class MountTest(log.Loggable, testsuite.TestCase):
     def setUp(self):
@@ -71,6 +73,11 @@
         return 'http://localhost:%d%s' % (self.component.port, path)
 
     def testDirMountEmpty(self):
+        if usingOldTwisted:
+            raise unittest.SkipTest("""
+File "twisted/web/http.py", line 836, in getClientIP
+    if isinstance(self.client, address.IPv4Address):
+exceptions.AttributeError: CancellableRequest instance has no attribute 'client'""")
         properties = {
             u'mount-point': '',
             u'path': self.path,
@@ -110,6 +117,12 @@
         return defer.DeferredList([d, d2, d3], fireOnOneErrback=True)
 
     def testDirMountOnDemand(self):
+        if usingOldTwisted:
+            raise unittest.SkipTest("""
+File "twisted/web/http.py", line 836, in getClientIP
+    if isinstance(self.client, address.IPv4Address):
+exceptions.AttributeError: CancellableRequest instance has no attribute 'client'""")
+
         properties = {
             u'mount-point': '/ondemand',
             u'path': self.path,