WIP: Debug flakiness

aduffeck · Nov 12, 2024 · 16c0ef7 · 16c0ef7
1 parent e77dd61
commit 16c0ef7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/.drone.star b/.drone.star
@@ -109,15 +109,7 @@ def main(ctx):
         checkGoGenerate(),
         coverage(),
         buildOnly(),
-        testIntegration(),
-        litmusOcisOldWebdav(),
-        litmusOcisNewWebdav(),
-        litmusOcisSpacesDav(),
-        cs3ApiValidatorOcis(),
-        cs3ApiValidatorS3NG(),
-        # virtual views don't work on edge at the moment
-        #virtualViews(),
-    ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12) + posixfsIntegrationTests(6)
+     ] + posixfsIntegrationTests(12)
 
 def coverage():
     return {
@@ -772,6 +764,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                             "DIVIDE_INTO_NUM_PARTS": parallelRuns,
                             "RUN_PART": runPart,
                             "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-POSIX-storage.md",
+                            "BEHAT_FEATURE": 'tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature',
                             "ACCEPTANCE_TEST_TYPE": "core-api",
                         },
                     },
@@ -780,7 +773,6 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                     redisService(),
                     ldapService(),
                 ],
-                "depends_on": ["unit-test-coverage"],
             },
         )
 

diff --git a/pkg/storage/fs/posix/tree/inotifywatcher.go b/pkg/storage/fs/posix/tree/inotifywatcher.go
@@ -64,18 +64,18 @@ func (iw *InotifyWatcher) Watch(path string) {
 				if isLockFile(event.Filename) || isTrash(event.Filename) || iw.tree.isUpload(event.Filename) {
 					continue
 				}
-				go func() {
-					switch e {
-					case inotifywaitgo.DELETE:
-						_ = iw.tree.Scan(event.Filename, ActionDelete, event.IsDir)
-					case inotifywaitgo.MOVED_FROM:
-						_ = iw.tree.Scan(event.Filename, ActionMoveFrom, event.IsDir)
-					case inotifywaitgo.CREATE, inotifywaitgo.MOVED_TO:
-						_ = iw.tree.Scan(event.Filename, ActionCreate, event.IsDir)
-					case inotifywaitgo.CLOSE_WRITE:
-						_ = iw.tree.Scan(event.Filename, ActionUpdate, event.IsDir)
-					}
-				}()
+				// go func() {
+				switch e {
+				case inotifywaitgo.DELETE:
+					_ = iw.tree.Scan(event.Filename, ActionDelete, event.IsDir)
+				case inotifywaitgo.MOVED_FROM:
+					_ = iw.tree.Scan(event.Filename, ActionMoveFrom, event.IsDir)
+				case inotifywaitgo.CREATE, inotifywaitgo.MOVED_TO:
+					_ = iw.tree.Scan(event.Filename, ActionCreate, event.IsDir)
+				case inotifywaitgo.CLOSE_WRITE:
+					_ = iw.tree.Scan(event.Filename, ActionUpdate, event.IsDir)
+				}
+				// }()
 			}
 
 		case err := <-errors: