mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-21 10:01:54 +00:00
Disable Twisted's Docker check wrt inotify support
It breaks our container-based CI, which is perfectly happy to give us inotify functionality, as is Docker in general as long as you don't use overlayfs.
This commit is contained in:
parent
6e5ba22f59
commit
7e9e447d5b
@ -7,6 +7,7 @@ from datetime import datetime
|
|||||||
import time
|
import time
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
|
|
||||||
|
from twisted.python.monkey import MonkeyPatcher
|
||||||
from twisted.internet import defer, reactor, task
|
from twisted.internet import defer, reactor, task
|
||||||
from twisted.internet.error import AlreadyCancelled
|
from twisted.internet.error import AlreadyCancelled
|
||||||
from twisted.python.failure import Failure
|
from twisted.python.failure import Failure
|
||||||
@ -48,7 +49,7 @@ class ConfigurationError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
def get_inotify_module():
|
def _get_inotify_module():
|
||||||
try:
|
try:
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
from allmydata.windows import inotify
|
from allmydata.windows import inotify
|
||||||
@ -66,6 +67,14 @@ def get_inotify_module():
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def get_inotify_module():
|
||||||
|
# Until Twisted #9579 is fixed, the Docker check just screws things up.
|
||||||
|
# Disable it.
|
||||||
|
monkey = MonkeyPatcher()
|
||||||
|
monkey.addPatch(runtime.platform, "isDocker", lambda: False)
|
||||||
|
return monkey.runWithPatches(_get_inotify_module)
|
||||||
|
|
||||||
|
|
||||||
def is_new_file(pathinfo, db_entry):
|
def is_new_file(pathinfo, db_entry):
|
||||||
if db_entry is None:
|
if db_entry is None:
|
||||||
return True
|
return True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user