diff --git a/Annex/Content.hs b/Annex/Content.hs index 62471f7305..c054d45951 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -177,7 +177,7 @@ posixLocker takelock lockfile = do winLocker :: (LockFile -> IO (Maybe LockHandle)) -> ContentLocker winLocker takelock _ (Just lockfile) = let lck = do - modifyContentDirWhenExists lockfile $ + modifyContentDir lockfile $ void $ liftIO $ tryIO $ writeFile (fromRawFilePath lockfile) "" liftIO $ takelock lockfile diff --git a/Annex/Content/Presence.hs b/Annex/Content/Presence.hs index ff12c865c2..9f44e3d840 100644 --- a/Annex/Content/Presence.hs +++ b/Annex/Content/Presence.hs @@ -113,7 +113,7 @@ inAnnexSafe key = inAnnex' (fromMaybe True) (Just False) go key - remove the lock file to clean up after ourselves. -} checklock (Just lockfile) contentfile = ifM (liftIO $ doesFileExist (fromRawFilePath contentfile)) - ( modifyContentDirWhenExists lockfile $ liftIO $ + ( modifyContentDir lockfile $ liftIO $ lockShared lockfile >>= \case Nothing -> return is_locked Just lockhandle -> do diff --git a/doc/bugs/tasty_test_limiting_broken_by_concurrency.mdwn b/doc/bugs/tasty_test_limiting_broken_by_concurrency.mdwn new file mode 100644 index 0000000000..73e322ae85 --- /dev/null +++ b/doc/bugs/tasty_test_limiting_broken_by_concurrency.mdwn @@ -0,0 +1,14 @@ +The changes to make `git-annex test` concurrent have +broken using eg `git-annex test -p 'concurrent get of dup key regression'` + +The problem is that tasty is being run with a subset of tests in each +runner, so most of them don't know about the test they're being limited to +perform. + +There either needs to be a way to disable concurrency (eg, run all tests +in one runner with -J1), or the code detect when tasty is limited, and +automatically disable concurrency. + +Also, it looks like the repo setup test is not being run, even though it's +supposed to be a dependency of the test it was limited to. +--[[Joey]] diff --git a/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5.mdwn b/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5.mdwn index 7e0702d2b8..a359ca8bee 100644 --- a/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5.mdwn +++ b/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5.mdwn @@ -213,3 +213,5 @@ Windows 10 version 21H2 (build 19044.1706), 64 bit. Git Annex is great. I use it several times a week with my multigigabyte backups, where it gives structure to my image-based backup routines, so you could say I'm a believer. :) [[!meta author=jkniiv]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5/comment_1_af091a5799ac0445033c05173e25a4af._comment b/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5/comment_1_af091a5799ac0445033c05173e25a4af._comment new file mode 100644 index 0000000000..0328e72957 --- /dev/null +++ b/doc/bugs/windows__58___two_repo_tests_fail_after_commit_5a98f2d5/comment_1_af091a5799ac0445033c05173e25a4af._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2022-05-23T16:57:34Z" + content=""" +Thanks for another fine bug report. + +I took a look at that commit, and it seems that reverting it for Windows +makes the most sense. There were two places where it changed behavior on +Windows, that were both separated from the code paths for other OS's. + +I've made that change, which should fix it. I'm going to close this bug +report, but please follow up if you still see the issue. + +(Also, I've opened [[tasty_test_limiting_broken_by_concurrency]] +"""]]