Revert r43353 - test suite regression on Windows

Reopens: twisted#7229 =============================================================================== [ERROR] Traceback (most recent call last): File "C:\Users\Build Slave\bot-glyph-6\windows7-64-py2.7-select\Twisted\twisted\internet\test\test_inotify.py", line 37, in setUp self.inotify = inotify.INotify() exceptions.AttributeError: 'NoneType' object has no attribute 'INotify' twisted.internet.test.test_inotify.TestINotify.test_deleteSelf twisted.internet.test.test_inotify.TestINotify.test_ignoreFilePath twisted.internet.test.test_inotify.TestINotify.test_seriesOfWatchAndIgnore twisted.internet.test.test_inotify.TestINotify.test_simpleDeleteDirectory ------------------------------------------------------------------------------- git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@43369 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
jwilk-forks · Oct 14, 2014 · d36d586 · d36d586
1 parent 2745f30
commit d36d586
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 208 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/bin/admin/run-test-suite b/bin/admin/run-test-suite
diff --git a/twisted/internet/test/test_inotify.py b/twisted/internet/test/test_inotify.py
@@ -4,7 +4,6 @@
 """
 Tests for the inotify wrapper in L{twisted.internet.inotify}.
 """
-import os
 
 from twisted.internet import defer, reactor
 from twisted.python import filepath, runtime
@@ -17,10 +16,6 @@
 else:
     from twisted.internet import inotify
 
-skipTravisCI = None
-if os.environ.get('TRAVIS') == 'true':
-    skipTravisCI = 'IN_DELETE_SELF is not working on Travis CI workers.'
-
 
 
 class TestINotify(unittest.TestCase):
@@ -224,7 +219,6 @@ def operation(path):
 
         return self._notificationTest(
             inotify.IN_DELETE_SELF, operation, expectedPath=self.dirname)
-    test_deleteSelf.skip = skipTravisCI
 
 
     def test_moveSelf(self):
@@ -304,8 +298,6 @@ def _eb():
         d = defer.Deferred()
         subdir.createDirectory()
         return d
-    # autoAdd depends IN_DELETE_SELF which is not working on Travis.
-    test_simpleDeleteDirectory.skip = skipTravisCI
 
 
     def test_ignoreDirectory(self):
@@ -419,7 +411,6 @@ def callIt(*args):
         expectedPath.remove()
 
         return notified
-    test_seriesOfWatchAndIgnore.skip = skipTravisCI
 
 
     def test_ignoreFilePath(self):
@@ -455,7 +446,6 @@ def callIt(*args):
         expectedPath2.remove()
 
         return notified
-    test_ignoreFilePath.skip = skipTravisCI
 
 
     def test_ignoreNonWatchedFile(self):

diff --git a/twisted/topfiles/7229.misc b/twisted/topfiles/7229.misc