From: francois Date: Sat, 9 Jan 2010 17:59:46 +0000 (-0800) Subject: contrib/fuse/runtests.py: Tolerate the tahoe CLI returning deprecation warnings X-Git-Tag: trac-4200~48 X-Git-Url: https://git.rkrishnan.org/simplejson/install-details.html?a=commitdiff_plain;h=d0c6aa569d965b3dd863d5882e01d443c42d88f6;p=tahoe-lafs%2Ftahoe-lafs.git contrib/fuse/runtests.py: Tolerate the tahoe CLI returning deprecation warnings Depending on the versions of external libraries such as Twisted of Foolscap, the tahoe CLI can display deprecation warnings on stdout. The tests should not interpret those warnings as a failure if the node is in fact correctly started. See http://allmydata.org/trac/tahoe/ticket/859 for an example of deprecation warnings. fixes #876 --- diff --git a/contrib/fuse/runtests.py b/contrib/fuse/runtests.py index a93455c2..4aa457bb 100644 --- a/contrib/fuse/runtests.py +++ b/contrib/fuse/runtests.py @@ -897,7 +897,7 @@ def wrap_os_error(meth, *args): ExpectedCreationOutput = r'(introducer|client) created in (?P.*?)\n' -ExpectedStartOutput = r'STARTING (?P.*?)\n(introducer|client) node probably started' +ExpectedStartOutput = r'(.*\n)*STARTING (?P.*?)\n(introducer|client) node probably started' if __name__ == '__main__':