mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Test.hs

1938 lines
74 KiB
Haskell
Raw Normal View History

added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
{- git-annex test suite
-
test: avoid unnecessary tests of variants of git remote Configuring chunking and encryption for a git remote has no effect, so skip testing those variants in the TestRemote call. It would be better if TestRemote itself could do this, but it doesn't seem possible there. There is no way to look at a Remote and tell if it supports chunking or encryption. Note that, while the test suite displays output as it it's testing exporting, it actually skips doing anything for the tests when run on the git remote. So at least does not waste time even though the output is not ideal. This commit was sponsored by Noam Kremen on Patreon.
2021-01-11 17:31:36 +00:00
- Copyright 2010-2021 Joey Hess <id@joeyh.name>
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
-
update licenses from GPL to AGPL This does not change the overall license of the git-annex program, which was already AGPL due to a number of sources files being AGPL already. Legally speaking, I'm adding a new license under which these files are now available; I already released their current contents under the GPL license. Now they're dual licensed GPL and AGPL. However, I intend for all my future changes to these files to only be released under the AGPL license, and I won't be tracking the dual licensing status, so I'm simply changing the license statement to say it's AGPL. (In some cases, others wrote parts of the code of a file and released it under the GPL; but in all cases I have contributed a significant portion of the code in each file and it's that code that is getting the AGPL license; the GPL license of other contributors allows combining with AGPL code.)
2019-03-13 19:48:14 +00:00
- Licensed under the GNU AGPL version 3 or higher.
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
-}
try building test suite on windows
2013-05-17 20:45:44 +00:00
{-# LANGUAGE CPP #-}
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
module Test where
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
import Types.Test
v7 Install new git hooks in this version. This does beg the question of what to do if git later gets eg a post-smudge hook, that could run git-annex smudge --update. I think the thing to do in that case would be to make git-annex smudge --update install the new hooks. That way, as the user uses git-annex, the hook would be created pretty quickly and without needing any extra syscalls except for when git-annex smudge --update is called. I considered doing something like that for installation of the post-checkout and post-merge hooks, which would have avoided the need for v7. But the only place it was cheap to do it would be in git-annex smudge which could cheaply notice that smudge.log didn't exist yet and so know the hooks needed to be installed. But since smudge used to populate pointer files, it would be quite surprising if a single git checkout/merge failed to update the work tree, and so that idea didn't work out. The other reason for v7 is psychological -- users don't need to worry about whether they might be running an old version of git-annex that doesn't support their v7 repository very well. And bug reports about "v6" have gotten a bit of a bad association in my head since they often hit one of the known limitations and didn't realize it was experimental. newtyped RepoVersion Int to avoid needing 2 comparisons in versionSupportsUnlockedPointers etc. Also it's just nicer. This commit was sponsored by John Pellman on Patreon.
2018-10-25 21:23:53 +00:00
import Types.RepoVersion
Split Test.hs and avoid optimising it much, to need less memory to compile. The ghc options were found by Sean Whitton; the debian arm autobuilders need those to build w/o OOM, and it seems to involve llvm using too much memory to optimize Test. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-02-18 15:48:48 +00:00
import Test.Framework
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
import Options.Applicative.Types
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
import Test.Tasty
import Test.Tasty.Runners
import Test.Tasty.HUnit
import Test.Tasty.QuickCheck
Revert "temporarily revert tasty-rerun support for this release" This reverts commit 8fcf041159d06986b5a11a3eddd115b4c71a39d8.
2014-01-27 18:22:44 +00:00
import Test.Tasty.Ingredients.Rerun
Support building with tasty-1.3 This commit was sponsored by Ethan Aubin.
2020-05-21 19:26:32 +00:00
import Test.Tasty.Options
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
import Options.Applicative (switch, long, help, internal)
move quickcheck Arbitrary declaration into test suite So git-annex can build w/o quickcheck installed.
2011-04-25 19:28:41 +00:00
test unused et al
2011-01-12 05:58:23 +00:00
import qualified Data.Map as M
Removed dependency on json library; all JSON is now handled by aeson. I've eyeballed all --json commands, and the only difference should be that some fields are re-ordered.
2016-07-26 23:15:34 +00:00
import qualified Data.ByteString.Lazy.UTF8 as BU8
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
import System.Environment
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
import Control.Concurrent.STM hiding (check)
better test framework
2010-11-02 21:08:16 +00:00
factor out common imports no code changes
2011-10-04 02:24:57 +00:00
import Common
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
import CmdLine.GitAnnex.Options
split groups of related functions out of Utility
2011-08-22 20:14:12 +00:00
add newtypes for QuickCheck to avoid LANG=C issues All properties changed to use them, except for prop_encode_c_decode_c_roundtrip, which already filtered to ascii for other reasons. A few modules had to be split out, because Setup does not build-depend on QuickCheck.
2020-11-10 00:07:31 +00:00
import qualified Utility.ShellEscape
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
import qualified Utility.RawFilePath as R
test locationlog contents too
2011-01-11 19:43:29 +00:00
import qualified Annex
split out two more Git modules
2011-12-13 19:22:43 +00:00
import qualified Git.Filename
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
import qualified Git.Types
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
import qualified Git.Ref
import qualified Git.LsTree
fix test case to convert slashes for DOS
2014-03-04 19:06:40 +00:00
import qualified Git.FilePath
remove 163 lines of code without changing anything except imports
2016-01-20 20:36:33 +00:00
import qualified Annex.Locations
avoid build warning on windows
2017-10-24 16:24:06 +00:00
#ifndef mingw32_HOST_OS
add annex-ignore-command and annex-sync-command configs Added remote configuration settings annex-ignore-command and annex-sync-command, which are dynamic equivilants of the annex-ignore and annex-sync configurations. For this I needed a new DynamicConfig infrastructure. Its implementation should be as fast as before when there is no dynamic config, and it caches so shell commands are only run once. Note that annex-ignore-command exits nonzero when the remote should be ignored. While that may seem backwards, it allows using the same command for it as for annex-sync-command when you want to disable both. This commit was sponsored by Trenton Cronholm on Patreon.
2017-08-17 16:26:14 +00:00
import qualified Types.GitConfig
avoid build warning on windows
2017-10-24 16:24:06 +00:00
#endif
test
2012-12-20 03:43:15 +00:00
import qualified Types.TrustLevel
successfully split Annex and AnnexState out of TypeInternals
2011-01-26 01:49:04 +00:00
import qualified Types
factored out a generic MapLog from uuid-based logs UUIDBased is just a MapLog with a UUID for the field.
2014-03-15 17:44:31 +00:00
import qualified Logs.MapLog
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
import qualified Logs.Trust
import qualified Logs.Remote
fix build
2012-05-06 00:11:08 +00:00
import qualified Logs.Unused
quickcheck test for transfer info read/write code Fixed a bug the quickcheck turned up.
2012-12-19 20:15:39 +00:00
import qualified Logs.Transfer
more quickcheck fun and the code gets better..
2012-12-20 02:14:12 +00:00
import qualified Logs.Presence
quickcheck property for parsing of content identifier logs
2019-02-21 16:22:50 +00:00
import qualified Logs.ContentIdentifier
disable debug output in test suite Added during a dev session in Jan and kept accidentially.
2015-06-17 17:49:29 +00:00
import qualified Logs.PreferredContent
data types and serialization for metadata A very haskell commit! Just data types, instances to serialize the metadata to a nice format, and QuickCheck tests. This commit was sponsored by Andreas Leha.
2014-02-12 21:54:28 +00:00
import qualified Types.MetaData
convert test to Remote
2011-03-27 20:58:28 +00:00
import qualified Remote
factor non-type stuff out of Key
2017-02-24 17:42:30 +00:00
import qualified Key
a few fixes for the test suite in direct mode Still far from working.
2013-05-15 21:44:30 +00:00
import qualified Config
split cost out into its own module Added a function to insert a new cost into a list, which could be used to asjust costs after a drag and drop.
2013-03-13 20:16:01 +00:00
import qualified Config.Cost
add test to ensure hmac remains stable
2011-04-21 20:56:24 +00:00
import qualified Crypto
Fix a git-annex test failure when run on NFS due to NFS lock files preventing directory removal. Should fix this: lock (v6 --force): FAIL Exception: .git/annex/keys: removeDirectoryRecursive: unsatisfied constraints (Directory not empty) Verified that the test case still catches the regression it's meant to. This commit was supported by the NSF-funded DataLad project.
2017-08-14 19:11:42 +00:00
import qualified Database.Keys
reorg
2015-12-15 19:34:28 +00:00
import qualified Annex.WorkTree
reorg
2014-01-26 20:36:31 +00:00
import qualified Annex.Init
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
import qualified Annex.CatFile
don't assume git-annex is in path when calling itself from test suite
2016-02-16 20:29:04 +00:00
import qualified Annex.Path
Added GIT_ANNEX_VECTOR_CLOCK environment variable Can be used to override the default timestamps used in log files in the git-annex branch. This is a dangerous environment variable; use with caution. Note that this only affects writing to the logs on the git-annex branch. It is not used for metadata in git commits (other env vars can be set for that). There are many other places where timestamps are still used, that don't get committed to git, but do touch disk. Including regular timestamps of files, and timestamps embedded in some files in .git/annex/, including the last fsck timestamp and timestamps in transfer log files. A good way to find such things in git-annex is to get for getPOSIXTime and getCurrentTime, although some of the results are of course false positives that never hit disk (unless git-annex gets swapped out..) So this commit does NOT necessarily make git-annex comply with some HIPPA privacy regulations; it's up to the user to determine if they can use it in a way compliant with such regulations. Benchmarking: It takes 0.00114 milliseconds to call getEnv "GIT_ANNEX_VECTOR_CLOCK" when that env var is not set. So, 100 thousand log files can be written with an added overhead of only 0.114 seconds. That should be by far swamped by the actual overhead of writing the log files and making the commit containing them. This commit was supported by the NSF-funded DataLad project.
2017-08-14 17:55:38 +00:00
import qualified Annex.VectorClock
avoid running adjusted branch tests when git is too old
2019-08-15 17:54:05 +00:00
import qualified Annex.AdjustedBranch
filter branches (incomplete) Promosing work toward metadata driven filter branches. A few methods to construct them are stubbed out; all the data types and pure code seems good. This commit was sponsored by Walter Somerville.
2014-02-16 21:39:54 +00:00
import qualified Annex.View
change directory encoding in ViewedFile such that the original directory can be extracted from it
2014-02-22 18:54:53 +00:00
import qualified Annex.View.ViewedFile
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
import qualified Logs.View
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
import qualified Command.TestRemote
add newtypes for QuickCheck to avoid LANG=C issues All properties changed to use them, except for prop_encode_c_decode_c_roundtrip, which already filtered to ascii for other reasons. A few modules had to be split out, because Setup does not build-depend on QuickCheck.
2020-11-10 00:07:31 +00:00
import qualified Utility.Path.Tests
fix
2011-09-28 19:17:45 +00:00
import qualified Utility.FileMode
fold Build/SysConfig.hs into BuildInfo via include This avoids warnings from stack about the module not being listed in the cabal file. So, the generated file is also renamed to Build/SysConfig. Note that the setup program seems to be cached despite these changes; I had to cabal clean to get cabal to update it so that Build/SysConfig was written. This commit was sponsored by Jochen Bartl on Patreon.
2017-12-14 16:46:57 +00:00
import qualified BuildInfo
handle C-style escapes in Format I was happily able to repurpose some code from Git.Filename to handle this. I remember writing that code... a whole afternoon at a coffee shop, after which I felt I'd struggled with Haskell and git, and sorta lost, in needing to write this nasty peice of code. But was also pleased at the use of a pair of functions and quickcheck that allowed me to get it 100% right. So, turns out I not only got it right, but the code wasn't as special-purpose as I'd feared. Yay!
2011-12-23 00:14:35 +00:00
import qualified Utility.Format
broke out Verifiable to a utility library, and added a quickcheck test
2012-09-08 03:23:52 +00:00
import qualified Utility.Verifiable
test: Fix threaded runtime hang. There was one forkProcess lurking in test.hs, and that seems to be responsible for recent buildd failures on amd64 and armhf. I was able to reproduce it pretty easily on amd64, and even once on i386, and it was clearly that same bad old threaded runtime hang. So removing this forkProcess should fix it. Odd that it lurked for some months before popping up.
2012-10-11 17:45:09 +00:00
import qualified Utility.Process
Bug fix: A recent change caused git-annex-shell to crash.
2012-10-16 02:22:40 +00:00
import qualified Utility.Misc
split out Utility.InodeCache
2013-02-14 20:17:40 +00:00
import qualified Utility.InodeCache
clean up from windows porting
2013-05-11 22:23:41 +00:00
import qualified Utility.Env
finally really add back custom-setup stanza Fourth or fifth try at this and finally found a way to make it work. Absurd amount of busy-work forced on me by change in cabal's behavior. Split up Utility modules that need posix stuff out of ones used by Setup. Various other hacks around inability for Setup to use anything that ifdefs a use of unix. Probably lost a full day of my life to this. This is how build systems make their users hate them. Just saying.
2017-12-31 20:08:31 +00:00
import qualified Utility.Env.Set
Fix bug in parsing of parens in some preferred content expressions. This fixes the behavior of the manual mode group. The current manual mode preferred content expression is: "present and (((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) or (not copies=semitrusted+:1))" The old matcher misparsed this, to basically: OR (present and (...)) (not copies=semitrusted+:1)) The paren handling and indeed the whole conversion from tokens to the matcher was just wrong. The new way may not be the cleverest, but I think it is correct, and you can see how it pattern matches structurally against the expressions when parsing them. That expression is now parsed to: MAnd (MOp <function>) (MOr (MOr (MAnd (MOp <function>) (MOp <function>)) (MNot (MOr (MOp <function>) (MOp <function>)))) (MNot (MOp <function>))) Which appears correct, and behaves correct in testing. Also threw in a simplifier, so the final generated Matcher has less unnecessary clutter in it. Mostly so that I could more easily read & confirm them. Also, added a simple test of the Matcher to the test suite. There is a small chance of badly formed preferred content expressions behaving differently than before due to this rewrite.
2013-05-25 01:33:54 +00:00
import qualified Utility.Matcher
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Utility.Hash
import qualified Utility.Scheduled
reorg quickcheck to a separate module
2015-11-17 19:49:22 +00:00
import qualified Utility.Scheduled.QuickCheck
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Utility.HumanTime
metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character. The fix is to stop using w82s, which does not properly reconstitute unicode strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This passes unicode through perfectly, including any invalid filesystem encoded characters. Note that toB64 / fromB64 are also used for creds and cipher embedding. It would be unfortunate if this change broke those uses. For cipher embedding, note that ciphers can contain arbitrary bytes (should really be using ByteString.Char8 there). Testing indicated it's not safe to use the new fromB64 there; I think that characters were incorrectly combined. For credpair embedding, the username or password could contain unicode. Before, that unicode would fail to round-trip through the b64. So, I guess this is not going to break any embedded creds that worked before. This bug may have affected some creds before, and if so, this change will not fix old ones, but should fix new ones at least.
2015-03-04 15:16:03 +00:00
import qualified Utility.Base64
finally really add back custom-setup stanza Fourth or fifth try at this and finally found a way to make it work. Absurd amount of busy-work forced on me by change in cabal's behavior. Split up Utility modules that need posix stuff out of ones used by Setup. Various other hacks around inability for Setup to use anything that ifdefs a use of unix. Probably lost a full day of my life to this. This is how build systems make their users hate them. Just saying.
2017-12-31 20:08:31 +00:00
import qualified Utility.Tmp.Dir
Always use filesystem encoding for all file and handle reads and writes. This is a big scary change. I have convinced myself it should be safe. I hope!
2016-12-24 18:46:31 +00:00
import qualified Utility.FileSystemEncoding
Fix mangling of --json output of utf-8 characters when not running in a utf-8 locale As long as all code imports Utility.Aeson rather than Data.Aeson, and no Strings that may contain utf-8 characters are used for eg, object keys via T.pack, this is guaranteed to fix the problem everywhere that git-annex generates json. It's kind of annoying to need to wrap ToJSON with a ToJSON', especially since every data type that has a ToJSON instance has to be ported over. However, that only took 50 lines of code, which is worth it to ensure full coverage. I initially tried an alternative approach of a newtype FileEncoded, which had to be used everywhere a String was fed into aeson, and chasing down all the sites would have been far too hard. Did consider creating an intentionally overlapping instance ToJSON String, and letting ghc fail to build anything that passed in a String, but am not sure that wouldn't pollute some library that git-annex depends on that happens to use ToJSON String internally. This commit was supported by the NSF-funded DataLad project.
2018-04-16 19:42:45 +00:00
import qualified Utility.Aeson
add regression test
2019-11-14 18:02:09 +00:00
import qualified Utility.CopyFile
fix windows build
2020-07-02 16:18:42 +00:00
import qualified Types.Remote
fix windows build
2014-10-16 19:54:02 +00:00
#ifndef mingw32_HOST_OS
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Remote.Helper.Encryptable
import qualified Types.Crypto
import qualified Utility.Gpg
ssh warnings
2013-05-17 20:51:46 +00:00
#endif
add a stupid test harness
2010-11-02 20:49:35 +00:00
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
optParser :: Parser TestOptions
optParser = TestOptions
Support building with tasty-1.3 This commit was sponsored by Ethan Aubin.
2020-05-21 19:26:32 +00:00
<$> snd tastyParser
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
<*> switch
( long "keep-failures"
<> help "preserve repositories on test failure"
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
)
<*> switch
( long "fakessh"
<> internal
)
<*> cmdParams "non-options are for internal use only"
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
Support building with tasty-1.3 This commit was sponsored by Ethan Aubin.
2020-05-21 19:26:32 +00:00
tastyParser :: ([String], Parser Test.Tasty.Options.OptionSet)
#if MIN_VERSION_tasty(1,3,0)
tastyParser = go
#else
tastyParser = ([], go)
#endif
where
go = suiteOptionParser ingredients (tests False True mempty)
remove leftovers from removed TestSuite build flag Test suite is always built, so this can be simplified.
2018-11-19 16:39:16 +00:00
runner :: TestOptions -> IO ()
runner opts
| fakeSsh opts = runFakeSsh (internalData opts)
| otherwise = runsubprocesstests =<< Utility.Env.getEnv subenv
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
where
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
-- Run git-annex test in a subprocess, so that any files
-- it may open will be closed before running finalCleanup.
-- This should prevent most failures to clean up after the test
-- suite.
subenv = "GIT_ANNEX_TEST_SUBPROCESS"
remove leftovers from removed TestSuite build flag Test suite is always built, so this can be simplified.
2018-11-19 16:39:16 +00:00
runsubprocesstests Nothing = do
Support building with tasty-1.3 This commit was sponsored by Ethan Aubin.
2020-05-21 19:26:32 +00:00
let warnings = fst tastyParser
unless (null warnings) $ do
hPutStrLn stderr "warnings from tasty:"
mapM_ (hPutStrLn stderr) warnings
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
pp <- Annex.Path.programPath
finally really add back custom-setup stanza Fourth or fifth try at this and finally found a way to make it work. Absurd amount of busy-work forced on me by change in cabal's behavior. Split up Utility modules that need posix stuff out of ones used by Setup. Various other hacks around inability for Setup to use anything that ifdefs a use of unix. Probably lost a full day of my life to this. This is how build systems make their users hate them. Just saying.
2017-12-31 20:08:31 +00:00
Utility.Env.Set.setEnv subenv "1" True
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
ps <- getArgs
convert to withCreateProcess for async exception safety Not yet 100% done, so far I've grepped for waitForProcess and converted everything that uses that to start the process with withCreateProcess. Except for some things like P2P.IO and Assistant.TransferrerPool, and Utility.CoProcess, that manage a pool of processes. See #2 in https://git-annex.branchable.com/todo/more_extensive_retries_to_mask_transient_failures/#comment-209f8a8c38e63fb3a704e1282cb269c7 for how those will need to be dealt with. checkSuccessProcess, ignoreFailureProcess, and forceSuccessProcess calls waitForProcess, so callers of them will also need to be dealt with, and have not been yet.
2020-06-03 19:48:09 +00:00
exitcode <- withCreateProcess (proc pp ps) $
\_ _ _ pid -> waitForProcess pid
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
unless (keepFailuresOption opts) finalCleanup
exitWith exitcode
remove leftovers from removed TestSuite build flag Test suite is always built, so this can be simplified.
2018-11-19 16:39:16 +00:00
runsubprocesstests (Just _) = isolateGitConfig $ do
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
ensuretmpdir
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
crippledfilesystem <- fst <$> Annex.Init.probeCrippledFileSystem' (toRawFilePath tmpdir)
avoid running adjusted branch tests when git is too old
2019-08-15 17:54:05 +00:00
adjustedbranchok <- Annex.AdjustedBranch.isGitVersionSupported
case tryIngredients ingredients (tastyOptionSet opts) (tests crippledfilesystem adjustedbranchok opts) of
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
Nothing -> error "No tests found!?"
Just act -> ifM act
( exitSuccess
, do
test: Avoid most situations involving failure to delete test directories By forking a worker process and only deleting the test directory once it exits. This way, if a test leaves files open, they'll get closed when the worker exits, so avoiding failure to delete open files on Windows, and failure to delete directories due to NFS lock files. If a test leaves a git worker process running, the closed pipes should cause the worker to exit too, also avoiding the problem there. The 10 second sleep ought to give plenty of time for such worker processes to exit, although this is of course a race. Finally, even if test directory fails to be deleted still, it won't appear as if the last test in the test suite failed; the error will be displayed at the very end. This commit was supported by the NSF-funded DataLad project.
2017-08-14 20:27:35 +00:00
putStrLn " (Failures above could be due to a bug in git-annex, or an incompatibility"
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
putStrLn " with utilities, such as git, installed on this system.)"
exitFailure
)
expose tasty test suite's option parser
2014-01-21 04:08:43 +00:00
ingredients :: [Ingredient]
ingredients =
test: Fix --list-tests Seems list order matters, I don't know why, but have reported it on #tasty
2015-03-31 18:47:27 +00:00
[ listingTests
, rerunningTests [consoleTestReporter]
expose tasty test suite's option parser
2014-01-21 04:08:43 +00:00
]
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
avoid running adjusted branch tests when git is too old
2019-08-15 17:54:05 +00:00
tests :: Bool -> Bool -> TestOptions -> TestTree
tests crippledfilesystem adjustedbranchok opts =
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
testGroup "Tests" $ properties
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
: withTestMode remotetestmode Nothing testRemotes
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
: map (\(d, te) -> withTestMode te (Just initTests) (unitTests d)) testmodes
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
where
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
testmodes = catMaybes
fix test suite The test suite found a bug; select_ can fail now because a uniqueness constrain has been added. Now the test suite passes. Also, I'm satisfied the changed PersistField instances work. Looking over what changed, and what I've already tested, Key, FilePath, and InodeCache are known working; ContentIdentifier is trivial ByteString to blob; and SSha is trivial String to varchar. Both are tested by the test suite. I've also tested the new FileSize and EpochTime instances already, and they work.
2019-10-30 19:33:58 +00:00
[ canadjust ("v8 adjusted unlocked branch", (testMode opts (RepoVersion 8)) { adjustedUnlockedBranch = True })
, unlesscrippled ("v8 unlocked", (testMode opts (RepoVersion 8)) { unlockedFiles = True })
, unlesscrippled ("v8 locked", testMode opts (RepoVersion 8))
fix build on windows
2015-12-28 16:57:42 +00:00
]
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
remotetestmode = testMode opts (RepoVersion 8)
100% pass on FAT
2016-02-16 20:02:54 +00:00
unlesscrippled v
| crippledfilesystem = Nothing
| otherwise = Just v
avoid running adjusted branch tests when git is too old
2019-08-15 17:54:05 +00:00
canadjust v
| adjustedbranchok = Just v
| otherwise = Nothing
refactor
2015-07-08 04:03:28 +00:00
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
properties :: TestTree
split up quickcheck tests for hashes and macs So when one fais, it's clear which one is the problem.
2020-03-02 18:25:45 +00:00
properties = localOption (QuickCheckTests 1000) $ testGroup "QuickCheck" $
fix failing quickcheck properties QuickCheck 2.10 found a counterexample eg "\929184" broke the property. As far as I can tell, Git.Filename is matching how git handles encoding of strange high unicode characters in filenames for display. Git does not display high unicode characters, and instead displays the C-style escaped form of each byte. This is ambiguous, but since git is not unicode aware, it doesn't need to roundtrip parse it. So, making Git.FileName's roundtrip test only chars < 256 seems fine. Utility.Format.format uses encode_c, in order to mimic git, so that's ok. Utility.Format.gen uses decode_c, but only so that stuff like "\n" in the format string is handled. If the format string contains C-style octal escapes, they will be converted to ascii characters, and not combined into unicode characters, but that should not be a problem. If the user wants unicode characters, they can include them in the format string, without escaping them. Finally, decode_c is used by Utility.Gpg.secretKeys, because gpg --with-colons hex-escapes some characters in particular ':' and '\\'. gpg passes unicode through, so this use of decode_c is not a problem. This commit was sponsored by Henrik Riomar on Patreon.
2017-06-17 20:17:09 +00:00
[ testProperty "prop_encode_decode_roundtrip" Git.Filename.prop_encode_decode_roundtrip
, testProperty "prop_encode_c_decode_c_roundtrip" Utility.Format.prop_encode_c_decode_c_roundtrip
factor non-type stuff out of Key
2017-02-24 17:42:30 +00:00
, testProperty "prop_isomorphic_key_encode" Key.prop_isomorphic_key_encode
add newtypes for QuickCheck to avoid LANG=C issues All properties changed to use them, except for prop_encode_c_decode_c_roundtrip, which already filtered to ascii for other reasons. A few modules had to be split out, because Setup does not build-depend on QuickCheck.
2020-11-10 00:07:31 +00:00
, testProperty "prop_isomorphic_shellEscape" Utility.ShellEscape.prop_isomorphic_shellEscape
, testProperty "prop_isomorphic_shellEscape_multiword" Utility.ShellEscape.prop_isomorphic_shellEscape_multiword
fix use of hifalutin terminology
2015-11-16 18:37:31 +00:00
, testProperty "prop_isomorphic_configEscape" Logs.Remote.prop_isomorphic_configEscape
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_parse_show_Config" Logs.Remote.prop_parse_show_Config
add newtypes for QuickCheck to avoid LANG=C issues All properties changed to use them, except for prop_encode_c_decode_c_roundtrip, which already filtered to ascii for other reasons. A few modules had to be split out, because Setup does not build-depend on QuickCheck.
2020-11-10 00:07:31 +00:00
, testProperty "prop_upFrom_basics" Utility.Path.Tests.prop_upFrom_basics
, testProperty "prop_relPathDirToFileAbs_basics" Utility.Path.Tests.prop_relPathDirToFileAbs_basics
, testProperty "prop_relPathDirToFileAbs_regressionTest" Utility.Path.Tests.prop_relPathDirToFileAbs_regressionTest
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_cost_sane" Config.Cost.prop_cost_sane
, testProperty "prop_matcher_sane" Utility.Matcher.prop_matcher_sane
, testProperty "prop_HmacSha1WithCipher_sane" Crypto.prop_HmacSha1WithCipher_sane
Added GIT_ANNEX_VECTOR_CLOCK environment variable Can be used to override the default timestamps used in log files in the git-annex branch. This is a dangerous environment variable; use with caution. Note that this only affects writing to the logs on the git-annex branch. It is not used for metadata in git commits (other env vars can be set for that). There are many other places where timestamps are still used, that don't get committed to git, but do touch disk. Including regular timestamps of files, and timestamps embedded in some files in .git/annex/, including the last fsck timestamp and timestamps in transfer log files. A good way to find such things in git-annex is to get for getPOSIXTime and getCurrentTime, although some of the results are of course false positives that never hit disk (unless git-annex gets swapped out..) So this commit does NOT necessarily make git-annex comply with some HIPPA privacy regulations; it's up to the user to determine if they can use it in a way compliant with such regulations. Benchmarking: It takes 0.00114 milliseconds to call getEnv "GIT_ANNEX_VECTOR_CLOCK" when that env var is not set. So, 100 thousand log files can be written with an added overhead of only 0.114 seconds. That should be by far swamped by the actual overhead of writing the log files and making the commit containing them. This commit was supported by the NSF-funded DataLad project.
2017-08-14 17:55:38 +00:00
, testProperty "prop_VectorClock_sane" Annex.VectorClock.prop_VectorClock_sane
factored out a generic MapLog from uuid-based logs UUIDBased is just a MapLog with a UUID for the field.
2014-03-15 17:44:31 +00:00
, testProperty "prop_addMapLog_sane" Logs.MapLog.prop_addMapLog_sane
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_verifiable_sane" Utility.Verifiable.prop_verifiable_sane
, testProperty "prop_segment_regressionTest" Utility.Misc.prop_segment_regressionTest
, testProperty "prop_read_write_transferinfo" Logs.Transfer.prop_read_write_transferinfo
, testProperty "prop_read_show_inodecache" Utility.InodeCache.prop_read_show_inodecache
quickcheck property for parsing of content identifier logs
2019-02-21 16:22:50 +00:00
, testProperty "prop_parse_build_presence_log" Logs.Presence.prop_parse_build_presence_log
, testProperty "prop_parse_build_contentidentifier_log" Logs.ContentIdentifier.prop_parse_build_contentidentifier_log
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_read_show_TrustLevel" Types.TrustLevel.prop_read_show_TrustLevel
convert old uuid-based log parsers to attoparsec This preserves the workaround for the old bug that caused NoUUID items to be stored in the log, prefixing log lines with " ". It's now handled implicitly, by using takeWhile1 (/= ' ') to get the uuid. There is a behavior change from the old parser, which split the value into words and then recombined it. That meant that "foo bar" and "foo\tbar" came out as "foo bar". That behavior was not documented, and seems surprising; it meant that after a git-annex describe here "foo bar", you wouldn't get that same string back out when git-annex displayed repo descriptions. Otoh, some other parsers relied on the old behavior, and the attoparsec rewrites had to deal with the issue themselves... For group.log, there are some edge cases around the user providing a group name with a leading or trailing space. The old parser would ignore such excess whitespace. The new parser does too, because the alternative is to refuse to parse something like " group1 group2 " due to excess whitespace, which would be even more confusing behavior. The only git-annex branch log file that is not converted to attoparsec and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
, testProperty "prop_parse_build_TrustLevelLog" Logs.Trust.prop_parse_build_TrustLevelLog
reorg quickcheck to a separate module
2015-11-17 19:49:22 +00:00
, testProperty "prop_schedule_roundtrips" Utility.Scheduled.QuickCheck.prop_schedule_roundtrips
add new test
2014-04-12 18:19:56 +00:00
, testProperty "prop_past_sane" Utility.Scheduled.prop_past_sane
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
, testProperty "prop_duration_roundtrips" Utility.HumanTime.prop_duration_roundtrips
fix metadata log simplifier and additional quickcheck tests
2014-02-13 02:27:55 +00:00
, testProperty "prop_metadata_sane" Types.MetaData.prop_metadata_sane
data types and serialization for metadata A very haskell commit! Just data types, instances to serialize the metadata to a nice format, and QuickCheck tests. This commit was sponsored by Andreas Leha.
2014-02-12 21:54:28 +00:00
, testProperty "prop_metadata_serialize" Types.MetaData.prop_metadata_serialize
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
, testProperty "prop_branchView_legal" Logs.View.prop_branchView_legal
view: Avoid using cute unicode homomorphs for '/' and '\' and instead use ugly escaping, as the unicode method doesn't work on non-unicode supporting systems.
2016-01-08 16:45:32 +00:00
, testProperty "prop_viewPath_roundtrips" Annex.View.prop_viewPath_roundtrips
add another quickcheck property, and several edge cases handled
2014-02-17 01:00:12 +00:00
, testProperty "prop_view_roundtrips" Annex.View.prop_view_roundtrips
change directory encoding in ViewedFile such that the original directory can be extracted from it
2014-02-22 18:54:53 +00:00
, testProperty "prop_viewedFile_rountrips" Annex.View.ViewedFile.prop_viewedFile_roundtrips
metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character. The fix is to stop using w82s, which does not properly reconstitute unicode strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This passes unicode through perfectly, including any invalid filesystem encoded characters. Note that toB64 / fromB64 are also used for creds and cipher embedding. It would be unfortunate if this change broke those uses. For cipher embedding, note that ciphers can contain arbitrary bytes (should really be using ByteString.Char8 there). Testing indicated it's not safe to use the new fromB64 there; I think that characters were incorrectly combined. For credpair embedding, the username or password could contain unicode. Before, that unicode would fail to round-trip through the b64. So, I guess this is not going to break any embedded creds that worked before. This bug may have affected some creds before, and if so, this change will not fix old ones, but should fix new ones at least.
2015-03-04 15:16:03 +00:00
, testProperty "prop_b64_roundtrips" Utility.Base64.prop_b64_roundtrips
add test case that all standard group preferred content expressions parse
2015-06-17 17:44:19 +00:00
, testProperty "prop_standardGroups_parse" Logs.PreferredContent.prop_standardGroups_parse
split up quickcheck tests for hashes and macs So when one fais, it's clear which one is the problem.
2020-03-02 18:25:45 +00:00
] ++ map (uncurry testProperty) combos
where
combos = concat
[ Utility.Hash.props_hashes_stable
, Utility.Hash.props_macs_stable
]
better test framework
2010-11-02 21:08:16 +00:00
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
testRemotes :: TestTree
testRemotes = testGroup "Remote Tests"
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
[ testGitRemote
, testDirectoryRemote
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
]
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
testGitRemote :: TestTree
test: avoid unnecessary tests of variants of git remote Configuring chunking and encryption for a git remote has no effect, so skip testing those variants in the TestRemote call. It would be better if TestRemote itself could do this, but it doesn't seem possible there. There is no way to look at a Remote and tell if it supports chunking or encryption. Note that, while the test suite displays output as it it's testing exporting, it actually skips doing anything for the tests when run on the git remote. So at least does not waste time even though the output is not ideal. This commit was sponsored by Noam Kremen on Patreon.
2021-01-11 17:31:36 +00:00
testGitRemote = testRemote False "git" $ \remotename -> do
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
git "clone" [".", "remotedir"] "git clone"
git "remote" ["add", remotename, "remotedir"] "git remote add"
testDirectoryRemote :: TestTree
test: avoid unnecessary tests of variants of git remote Configuring chunking and encryption for a git remote has no effect, so skip testing those variants in the TestRemote call. It would be better if TestRemote itself could do this, but it doesn't seem possible there. There is no way to look at a Remote and tell if it supports chunking or encryption. Note that, while the test suite displays output as it it's testing exporting, it actually skips doing anything for the tests when run on the git remote. So at least does not waste time even though the output is not ideal. This commit was sponsored by Noam Kremen on Patreon.
2021-01-11 17:31:36 +00:00
testDirectoryRemote = testRemote True "directory" $ \remotename -> do
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
createDirectory "remotedir"
git_annex "initremote"
[ remotename
, "type=directory"
, "--quiet"
, "directory=remotedir"
, "encryption=none"
] "init"
test: avoid unnecessary tests of variants of git remote Configuring chunking and encryption for a git remote has no effect, so skip testing those variants in the TestRemote call. It would be better if TestRemote itself could do this, but it doesn't seem possible there. There is no way to look at a Remote and tell if it supports chunking or encryption. Note that, while the test suite displays output as it it's testing exporting, it actually skips doing anything for the tests when run on the git remote. So at least does not waste time even though the output is not ideal. This commit was sponsored by Noam Kremen on Patreon.
2021-01-11 17:31:36 +00:00
testRemote :: Bool -> String -> (String -> IO ()) -> TestTree
testRemote testvariants remotetype setupremote =
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
withResource newEmptyTMVarIO (const noop) $ \getv ->
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
testGroup ("testremote type " ++ remotetype) $ concat
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
[ [testCase "init" (prep getv)]
, go getv
]
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
where
reponame = "test repo"
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
remotename = "testremote"
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
basesz = 1024 * 1024
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
keysizes = Command.TestRemote.keySizes basesz False
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
prep getv = do
d <- newmainrepodir
setmainrepodir d
innewrepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "init" [reponame, "--quiet"] "init"
add testremote of a git remote to test suite The test suite contains its own tests that test a lot of basic stuff about git remotes, mostly in passing to set up other situations. But testremote does try some unusual edge cases, which may as well be tried for git remotes as well as directory, especially since it's so little code to add it. This commit was sponsored by Kevin Mueller on Patreon.
2021-01-11 17:05:27 +00:00
setupremote remotename
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
r <- annexeval $ either error return
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
=<< Remote.byName' remotename
testremote: Fix over-allocation of resources and bad caching Including starting up a large number of external special remote processes. (Regression introduced in version 8.20200501)
2020-06-22 18:25:49 +00:00
cache <- Command.TestRemote.newRemoteVariantCache
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
unavailr <- annexeval $ Types.Remote.mkUnavailable r
testremote: Fix over-allocation of resources and bad caching Including starting up a large number of external special remote processes. (Regression introduced in version 8.20200501)
2020-06-22 18:25:49 +00:00
exportr <- annexeval $ Command.TestRemote.exportTreeVariant cache r
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
ks <- annexeval $ mapM Command.TestRemote.randKey keysizes
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
v <- getv
testremote: Fix over-allocation of resources and bad caching Including starting up a large number of external special remote processes. (Regression introduced in version 8.20200501)
2020-06-22 18:25:49 +00:00
cv <- annexeval cache
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
liftIO $ atomically $ putTMVar v
testremote: Fix over-allocation of resources and bad caching Including starting up a large number of external special remote processes. (Regression introduced in version 8.20200501)
2020-06-22 18:25:49 +00:00
(r, (unavailr, (exportr, (ks, cv))))
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
go getv = Command.TestRemote.mkTestTrees runannex mkrs mkunavailr mkexportr mkks
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
where
runannex = inmainrepo . annexeval
test: avoid unnecessary tests of variants of git remote Configuring chunking and encryption for a git remote has no effect, so skip testing those variants in the TestRemote call. It would be better if TestRemote itself could do this, but it doesn't seem possible there. There is no way to look at a Remote and tell if it supports chunking or encryption. Note that, while the test suite displays output as it it's testing exporting, it actually skips doing anything for the tests when run on the git remote. So at least does not waste time even though the output is not ideal. This commit was sponsored by Noam Kremen on Patreon.
2021-01-11 17:31:36 +00:00
mkrs = if testvariants
then Command.TestRemote.remoteVariants cache mkr basesz False
else [fmap (fmap Just) mkr]
added remote variants Todo item is done at last. Might later want to think about testing some other types of remotes that can be tested locally. The git remote itself is probably already well enough tested by the test suite that testremote is not needed. Could test things like bup, or rsync to a local directory. Or even external, although that would require embedding an external special remote program into the test suite..
2020-04-30 17:49:22 +00:00
mkr = descas (remotetype ++ " remote") (fst <$> v)
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
mkunavailr = fst . snd <$> v
added export remote tests
2020-04-30 17:13:08 +00:00
mkexportr = fst . snd . snd <$> v
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
mkks = map (\(sz, n) -> desckeysize sz (getk n))
(zip keysizes [0..])
testremote: Fix over-allocation of resources and bad caching Including starting up a large number of external special remote processes. (Regression introduced in version 8.20200501)
2020-06-22 18:25:49 +00:00
getk n = fmap (!! n) (fst . snd . snd . snd <$> v)
cache = snd . snd . snd . snd <$> v
testremote in test is working Not yet testing export, or remote variants, but it already adds several hundred test cases, so big win.
2020-04-30 16:59:20 +00:00
v = liftIO $ atomically . readTMVar =<< getv
descas = Command.TestRemote.Described
desckeysize sz = descas ("key size " ++ show sz)
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
{- These tests set up the test environment, but also test some basic parts
- of git-annex. They are always run before the unitTests. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
initTests :: TestTree
initTests = testGroup "Init Tests"
[ testCase "init" test_init
, testCase "add" test_add
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
unitTests :: String -> TestTree
unitTests note = testGroup ("Unit Tests " ++ note)
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
[ testCase "add dup" test_add_dup
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "add extras" test_add_extras
fix reversion in skipping deleted files And add a test case for that. This certianly loses some of the 2x performance improvement in file seeking that seekFilteredKeys led to, because now it has to stat the worktree files again. Without benchmarking, I expect there will still be a sizable improvement, and also the git-annex branch precaching that seekFilteredKeys can do will still be a win of its approach. Also worth noting that lookupKey, when the file DNE, check if it's in an adjusted branch with hidden files, and if so, finds the key for the file anyway. That was intended to make git-annex sync --content be able to process those files, but a side effect was that, when a file was deleted but the deletion not yet staged, git-annex commands used to still list it. That was actually a bug. This commit fixes that bug too. (git-annex sync --content on such a branch does not use seekFilteredKeys so was not affected by the reversion or by this behavior change) This commit was sponsored by Jake Vosloo on Patreon.
2020-07-20 00:33:10 +00:00
, testCase "ignore deleted files" test_ignore_deleted_files
test metadata
2020-07-13 16:53:09 +00:00
, testCase "metadata" test_metadata
add export+import test case
2019-03-06 20:49:33 +00:00
, testCase "export_import" test_export_import
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
, testCase "export_import_subdir" test_export_import_subdir
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
, testCase "shared clone" test_shared_clone
log: Fix reversion introduced in version 5.20150528 that broke this command.
2015-07-02 16:53:38 +00:00
, testCase "log" test_log
test case for view For reversion fixed in 9252f86b2e9a3ee218867e1ef4572766eb44418c This commit was sponsored by Ethan Aubin
2020-11-02 19:06:55 +00:00
, testCase "view" test_view
test if magic library works (When built with it.) I saw John Thorvald Wodder II doing this in https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml and it seemed like a good idea. John used an empty file for the binary file, but I think it's slightly suprising file picks that mime type for it, so opted to instead use something less ambiguous.
2020-10-27 17:39:58 +00:00
, testCase "magic" test_magic
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
, testCase "import" test_import
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "reinject" test_reinject
, testCase "unannex (no copy)" test_unannex_nocopy
, testCase "unannex (with copy)" test_unannex_withcopy
, testCase "drop (no remote)" test_drop_noremote
, testCase "drop (with remote)" test_drop_withremote
, testCase "drop (untrusted remote)" test_drop_untrustedremote
, testCase "get" test_get
test move with ssh remote
2017-03-17 23:18:45 +00:00
, testCase "get (ssh remote)" test_get_ssh_remote
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "move" test_move
test move with ssh remote
2017-03-17 23:18:45 +00:00
, testCase "move (ssh remote)" test_move_ssh_remote
add a test case that move respects numcopies There is already one for drop, but move and drop don't handle numcopies exactly the same, and there was recently a reversion in it checking numcopies properly at all. This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 17:49:12 +00:00
, testCase "move (numcopies)" test_move_numcopies
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "copy" test_copy
, testCase "lock" test_lock
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
, testCase "lock --force" test_lock_force
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "edit (no pre-commit)" test_edit
, testCase "edit (pre-commit)" test_edit_precommit
, testCase "partial commit" test_partial_commit
, testCase "fix" test_fix
, testCase "trust" test_trust
, testCase "fsck (basics)" test_fsck_basic
, testCase "fsck (bare)" test_fsck_bare
, testCase "fsck (local untrusted)" test_fsck_localuntrusted
, testCase "fsck (remote untrusted)" test_fsck_remoteuntrusted
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113. The directory special remote was not affected in its normal configuration, since annex-directory is an absolute path normally. But it could fail when a relative path was used. The git remote was affected even when an absolute path to it was used in .git/config, since git-annex now converts all such paths to relative.
2015-04-18 17:36:12 +00:00
, testCase "fsck --from remote" test_fsck_fromremote
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "migrate" test_migrate
, testCase "migrate (via gitattributes)" test_migrate_via_gitattributes
, testCase "unused" test_unused
, testCase "describe" test_describe
, testCase "find" test_find
, testCase "merge" test_merge
, testCase "info" test_info
, testCase "version" test_version
, testCase "sync" test_sync
add regression test
2019-11-14 18:02:09 +00:00
, testCase "concurrent get of dup key regression" test_concurrent_get_of_dup_key_regression
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "union merge regression" test_union_merge_regression
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
, testCase "adjusted branch merge regression" test_adjusted_branch_merge_regression
add test case for sync_in_adjusted_branch_deleted_recently_added_files This commit was sponsored by Denis Dzyubenko on Patreon.
2016-10-11 18:22:49 +00:00
, testCase "adjusted branch subtree regression" test_adjusted_branch_subtree_regression
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "conflict resolution" test_conflict_resolution
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
, testCase "conflict resolution (adjusted branch)" test_conflict_resolution_adjusted_branch
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "conflict resolution movein regression" test_conflict_resolution_movein_regression
, testCase "conflict resolution (mixed directory and file)" test_mixed_conflict_resolution
, testCase "conflict resolution symlink bit" test_conflict_resolution_symlink_bit
, testCase "conflict resolution (uncommitted local file)" test_uncommitted_conflict_resolution
, testCase "conflict resolution (removed file)" test_remove_conflict_resolution
, testCase "conflict resolution (nonannexed file)" test_nonannexed_file_conflict_resolution
, testCase "conflict resolution (nonannexed symlink)" test_nonannexed_symlink_conflict_resolution
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
, testCase "conflict resolution (mixed locked and unlocked file)" test_mixed_lock_conflict_resolution
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "map" test_map
, testCase "uninit" test_uninit
, testCase "uninit (in git-annex branch)" test_uninit_inbranch
, testCase "upgrade" test_upgrade
, testCase "whereis" test_whereis
, testCase "hook remote" test_hook_remote
, testCase "directory remote" test_directory_remote
, testCase "rsync remote" test_rsync_remote
, testCase "bup remote" test_bup_remote
, testCase "crypto" test_crypto
, testCase "preferred content" test_preferred_content
, testCase "add subdirs" test_add_subdirs
test case for addurl file://
2015-02-10 19:20:07 +00:00
, testCase "addurl" test_addurl
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
]
wip This does not compile, and I hit a bad dead end. Wah.
2020-04-29 19:48:09 +00:00
-- this test case creates the main repo
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_init :: Assertion
test_init = innewrepo $ do
pass --version to init when needed
2015-12-16 17:14:18 +00:00
ver <- annexVersion <$> getTestMode
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "init" [reponame, "--version", show (fromRepoVersion ver)] "init"
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
setupTestMode
where indenting
2012-11-11 04:51:07 +00:00
where
reponame = "test repo"
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
-- this test case runs in the main repo, to set up a basic
-- annexed file that later tests will use
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add :: Assertion
test_add = inmainrepo $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent annexedfile $ content annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex annexedfile "add"
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
annexed_present annexedfile
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent sha1annexedfile $ content sha1annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [sha1annexedfile, "--backend=SHA1"] "add with SHA1"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
whenM (unlockedFiles <$> getTestMode) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [sha1annexedfile] "unlock"
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
annexed_present sha1annexedfile
checkbackend sha1annexedfile backendSHA1
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
writecontent ingitfile $ content ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" [ingitfile] "git add"
git "commit" ["-q", "-m", "commit"] "git commit"
git_annex "add" [ingitfile] "add ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
test_add_dup :: Assertion
test_add_dup = intmpclonerepo $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent annexedfiledup $ content annexedfiledup
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex annexedfiledup "add of second file with same content failed"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
annexed_present annexedfiledup
annexed_present annexedfile
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add_extras :: Assertion
test_add_extras = intmpclonerepo $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent wormannexedfile $ content wormannexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [wormannexedfile, "--backend=WORM"] "add with WORM"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
whenM (unlockedFiles <$> getTestMode) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [wormannexedfile] "unlock"
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
annexed_present wormannexedfile
checkbackend wormannexedfile backendWORM
fix reversion in skipping deleted files And add a test case for that. This certianly loses some of the 2x performance improvement in file seeking that seekFilteredKeys led to, because now it has to stat the worktree files again. Without benchmarking, I expect there will still be a sizable improvement, and also the git-annex branch precaching that seekFilteredKeys can do will still be a win of its approach. Also worth noting that lookupKey, when the file DNE, check if it's in an adjusted branch with hidden files, and if so, finds the key for the file anyway. That was intended to make git-annex sync --content be able to process those files, but a side effect was that, when a file was deleted but the deletion not yet staged, git-annex commands used to still list it. That was actually a bug. This commit fixes that bug too. (git-annex sync --content on such a branch does not use seekFilteredKeys so was not affected by the reversion or by this behavior change) This commit was sponsored by Jake Vosloo on Patreon.
2020-07-20 00:33:10 +00:00
test_ignore_deleted_files :: Assertion
test_ignore_deleted_files = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
fix reversion in skipping deleted files And add a test case for that. This certianly loses some of the 2x performance improvement in file seeking that seekFilteredKeys led to, because now it has to stat the worktree files again. Without benchmarking, I expect there will still be a sizable improvement, and also the git-annex branch precaching that seekFilteredKeys can do will still be a win of its approach. Also worth noting that lookupKey, when the file DNE, check if it's in an adjusted branch with hidden files, and if so, finds the key for the file anyway. That was intended to make git-annex sync --content be able to process those files, but a side effect was that, when a file was deleted but the deletion not yet staged, git-annex commands used to still list it. That was actually a bug. This commit fixes that bug too. (git-annex sync --content on such a branch does not use seekFilteredKeys so was not affected by the reversion or by this behavior change) This commit was sponsored by Jake Vosloo on Patreon.
2020-07-20 00:33:10 +00:00
git_annex_expectoutput "find" [] [annexedfile]
finish fixing removeLink on windows 9cb250f7be21a8f5b15454df4fb67bfd1811e39d got the ones in RawFilePath, but there were others that used the one from unix-compat, which fails at runtime on windows. To avoid this, import System.PosixCompat.Files hiding removeLink This commit was sponsored by Ethan Aubin.
2020-11-24 16:38:12 +00:00
removeWhenExistsWith R.removeLink (toRawFilePath annexedfile)
fix reversion in skipping deleted files And add a test case for that. This certianly loses some of the 2x performance improvement in file seeking that seekFilteredKeys led to, because now it has to stat the worktree files again. Without benchmarking, I expect there will still be a sizable improvement, and also the git-annex branch precaching that seekFilteredKeys can do will still be a win of its approach. Also worth noting that lookupKey, when the file DNE, check if it's in an adjusted branch with hidden files, and if so, finds the key for the file anyway. That was intended to make git-annex sync --content be able to process those files, but a side effect was that, when a file was deleted but the deletion not yet staged, git-annex commands used to still list it. That was actually a bug. This commit fixes that bug too. (git-annex sync --content on such a branch does not use seekFilteredKeys so was not affected by the reversion or by this behavior change) This commit was sponsored by Jake Vosloo on Patreon.
2020-07-20 00:33:10 +00:00
-- A file that has been deleted, but the deletion not staged,
-- is a special case; make sure git-annex skips these.
git_annex_expectoutput "find" [] []
test metadata
2020-07-13 16:53:09 +00:00
test_metadata :: Assertion
test_metadata = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "metadata" ["-s", "foo=bar", annexedfile] "set metadata"
test metadata
2020-07-13 16:53:09 +00:00
git_annex_expectoutput "find" ["--metadata", "foo=bar"] [annexedfile]
git_annex_expectoutput "find" ["--metadata", "foo=other"] []
writecontent annexedfiledup $ content annexedfiledup
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex annexedfiledup "add of second file with same content failed"
test metadata
2020-07-13 16:53:09 +00:00
annexed_present annexedfiledup
git_annex_expectoutput "find" ["--metadata", "foo=bar"]
[annexedfile, annexedfiledup]
git_annex_shouldfail "metadata" ["--remove", "foo", "."]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"removing metadata from dir with multiple files not allowed"
test metadata
2020-07-13 16:53:09 +00:00
git_annex "metadata" ["--remove", "foo", annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"removing metadata"
test metadata
2020-07-13 16:53:09 +00:00
git_annex_expectoutput "find" ["--metadata", "foo=bar"] []
git_annex "metadata" ["--force", "-s", "foo=bar", "."]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"recursively set metadata force"
test metadata
2020-07-13 16:53:09 +00:00
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
test_shared_clone :: Assertion
test_shared_clone = intmpsharedclonerepo $ do
v <- catchMaybeIO $ Utility.Process.readProcess "git"
[ "config"
, "--bool"
, "--get"
, "annex.hardlink"
]
v == Just "true\n"
@? "shared clone of repo did not get annex.hardlink set"
log: Fix reversion introduced in version 5.20150528 that broke this command.
2015-07-02 16:53:38 +00:00
test_log :: Assertion
test_log = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "log" [annexedfile] "log"
log: Fix reversion introduced in version 5.20150528 that broke this command.
2015-07-02 16:53:38 +00:00
test case for view For reversion fixed in 9252f86b2e9a3ee218867e1ef4572766eb44418c This commit was sponsored by Ethan Aubin
2020-11-02 19:06:55 +00:00
test_view :: Assertion
test_view = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "metadata" ["-s", "test=test1", annexedfile] "metadata"
git_annex "metadata" ["-s", "test=test2", sha1annexedfile] "metadata"
git_annex "view" ["test=test1"] "entering view"
test case for view For reversion fixed in 9252f86b2e9a3ee218867e1ef4572766eb44418c This commit was sponsored by Ethan Aubin
2020-11-02 19:06:55 +00:00
checkexists annexedfile
checkdoesnotexist sha1annexedfile
test if magic library works (When built with it.) I saw John Thorvald Wodder II doing this in https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml and it seemed like a good idea. John used an empty file for the binary file, but I think it's slightly suprising file picks that mime type for it, so opted to instead use something less ambiguous.
2020-10-27 17:39:58 +00:00
test_magic :: Assertion
test_magic = intmpclonerepo $ do
#ifdef WITH_MAGICMIME
Made the test suite significantly less noisy Only displaying git-annex and git command output when something went wrong. A few could still leak stderr. These include the couple of calls to readProcess, which reads stdin but lets stderr through. But they don't leak any usually, so probably only would when failing anyway. Currently, there is no excess output at all! This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 18:07:46 +00:00
git "config" ["annex.largefiles", "mimeencoding=binary"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"git config annex.largefiles"
test if magic library works (When built with it.) I saw John Thorvald Wodder II doing this in https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml and it seemed like a good idea. John used an empty file for the binary file, but I think it's slightly suprising file picks that mime type for it, so opted to instead use something less ambiguous.
2020-10-27 17:39:58 +00:00
writeFile "binary" "\127"
writeFile "text" "test\n"
git_annex "add" ["binary", "text"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"git-annex add with mimeencoding in largefiles"
test if magic library works (When built with it.) I saw John Thorvald Wodder II doing this in https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml and it seemed like a good idea. John used an empty file for the binary file, but I think it's slightly suprising file picks that mime type for it, so opted to instead use something less ambiguous.
2020-10-27 17:39:58 +00:00
git_annex "sync" []
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"git-annex sync"
test if magic library works (When built with it.) I saw John Thorvald Wodder II doing this in https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml and it seemed like a good idea. John used an empty file for the binary file, but I think it's slightly suprising file picks that mime type for it, so opted to instead use something less ambiguous.
2020-10-27 17:39:58 +00:00
(isJust <$> annexeval (Annex.CatFile.catKeyFile (encodeBS "binary")))
@? "binary file not added to annex despite mimeencoding config"
(isNothing <$> annexeval (Annex.CatFile.catKeyFile (encodeBS "text")))
@? "non-binary file got added to annex despite mimeencoding config"
#else
return ()
#endif
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
test_import :: Assertion
finally really add back custom-setup stanza Fourth or fifth try at this and finally found a way to make it work. Absurd amount of busy-work forced on me by change in cabal's behavior. Split up Utility modules that need posix stuff out of ones used by Setup. Various other hacks around inability for Setup to use anything that ifdefs a use of unix. Probably lost a full day of my life to this. This is how build systems make their users hate them. Just saying.
2017-12-31 20:08:31 +00:00
test_import = intmpclonerepo $ Utility.Tmp.Dir.withTmpDir "importtest" $ \importdir -> do
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
(toimport1, importf1, imported1) <- mktoimport importdir "import1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" [toimport1] "import"
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
annexed_present_imported imported1
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist importf1
(toimport2, importf2, imported2) <- mktoimport importdir "import2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" [toimport2] "import of duplicate"
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
annexed_present_imported imported2
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist importf2
(toimport3, importf3, imported3) <- mktoimport importdir "import3"
git_annex "import" ["--skip-duplicates", toimport3]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"import of duplicate with --skip-duplicates"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist imported3
checkexists importf3
git_annex "import" ["--clean-duplicates", toimport3]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"import of duplicate with --clean-duplicates"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist imported3
checkdoesnotexist importf3
(toimport4, importf4, imported4) <- mktoimport importdir "import4"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" ["--deduplicate", toimport4] "import --deduplicate"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist imported4
checkdoesnotexist importf4
(toimport5, importf5, imported5) <- mktoimport importdir "import5"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" ["--duplicate", toimport5] "import --duplicate"
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
annexed_present_imported imported5
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkexists importf5
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--force", imported1, imported2, imported5] "drop"
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
annexed_notpresent_imported imported2
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
(toimportdup, importfdup, importeddup) <- mktoimport importdir "importdup"
test: display error messages from git-annex on unexpected failures .. but not on expected failures
2018-10-30 14:49:39 +00:00
git_annex_shouldfail "import" ["--clean-duplicates", toimportdup]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"import of missing duplicate with --clean-duplicates not allowed"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist importeddup
checkexists importfdup
where
mktoimport importdir subdir = do
createDirectory (importdir </> subdir)
let importf = subdir </> "f"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent (importdir </> importf) (content importf)
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
return (importdir </> subdir, importdir </> importf, importf)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_reinject :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_reinject = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--force", sha1annexedfile] "drop"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_notpresent sha1annexedfile
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent tmp $ content sha1annexedfile
rename key2file and file2key What these generate is not really suitable to be used as a filename, which is why keyFile and fileKey further escape it. These are just serializing Keys. Also removed a quickcheck test that was very unlikely to test anything useful, since it relied on random chance creating something that looks like a serialized key. The other test is sufficient for testing what that was intended to test anyway.
2019-01-14 17:03:35 +00:00
key <- Key.serializeKey <$> getKey backendSHA1 tmp
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "reinject" [tmp, sha1annexedfile] "reinject"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present sha1annexedfile
avoid fromkey test when on crippled fs
2016-02-15 20:54:44 +00:00
-- fromkey can't be used on a crippled filesystem, since it makes a
-- symlink
unlessM (annexeval Config.crippledFileSystem) $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fromkey" [key, sha1annexedfiledup] "fromkey for dup"
avoid fromkey test when on crippled fs
2016-02-15 20:54:44 +00:00
annexed_present_locked sha1annexedfiledup
where indenting
2012-11-11 04:51:07 +00:00
where
tmp = "tmpfile"
add tests of setkey/fromkey
2011-01-11 23:59:11 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unannex_nocopy :: Assertion
test_unannex_nocopy = intmpclonerepo $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unannex" [annexedfile] "unannex with no copy"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unannex_withcopy :: Assertion
test_unannex_withcopy = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unannex" [annexedfile, sha1annexedfile] "unannex"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unannex" [annexedfile] "unannex on non-annexed file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unannex" [ingitfile] "unannex ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_noremote :: Assertion
test_drop_noremote = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
git "remote" ["rm", "origin"] "git remote rm origin"
git_annex_shouldfail "drop" [annexedfile] "drop with no known copy of file not allowed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--force", annexedfile] "drop --force"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile] "drop of dropped file"
git_annex "drop" [ingitfile] "drop ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_withremote :: Assertion
test_drop_withremote = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "numcopies" ["2"] "numcopies config"
git_annex_shouldfail "drop" [annexedfile] "drop with numcopies not satisfied is not allowed"
git_annex "numcopies" ["1"] "numcopies config"
git_annex "drop" [annexedfile] "drop when origin has copy"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
Windows: Fix bug in dropping an annexed file, which caused a symlink to be staged that contained backslashes.
2015-02-09 19:24:33 +00:00
-- make sure that the correct symlink is staged for the file
-- after drop
git_annex_expectoutput "status" [] []
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_untrustedremote :: Assertion
test_drop_untrustedremote = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "untrust" ["origin"] "untrust of origin"
git_annex "get" [annexedfile] "get"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile] "drop with only an untrusted copy of the file should fail"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_get :: Assertion
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
test_get = test_get' intmpclonerepo
test_get_ssh_remote :: Assertion
disable 2 failing tests on windows I have not tracked down why these fail on windows, but they mostly test git-annex-shell anyway, and windows rarely acts as a ssh server.
2019-08-08 18:58:40 +00:00
test_get_ssh_remote =
#ifndef mingw32_HOST_OS
test_get' (with_ssh_origin intmpclonerepo)
#else
noop
#endif
test suite infra for testing mocked ssh remotes This commit was supported by the NSF-funded DataLad project.
2017-03-17 23:13:52 +00:00
test_get' :: (Assertion -> Assertion) -> Assertion
test_get' setup = setup $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file already here"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
inmainrepo $ unannexed ingitfile
unannexed ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [ingitfile] "get ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
inmainrepo $ unannexed ingitfile
unannexed ingitfile
more tests
2011-01-07 05:02:06 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_move :: Assertion
test move with ssh remote
2017-03-17 23:18:45 +00:00
test_move = test_move' intmpclonerepo
test_move_ssh_remote :: Assertion
disable 2 failing tests on windows I have not tracked down why these fail on windows, but they mostly test git-annex-shell anyway, and windows rarely acts as a ssh server.
2019-08-08 18:58:40 +00:00
test_move_ssh_remote =
#ifndef mingw32_HOST_OS
test_move' (with_ssh_origin intmpclonerepo)
#else
noop
#endif
test move with ssh remote
2017-03-17 23:18:45 +00:00
test_move' :: (Assertion -> Assertion) -> Assertion
test_move' setup = setup $ do
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--from", "origin", annexedfile] "move --from of file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--from", "origin", annexedfile] "move --from of file already here"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--to", "origin", annexedfile] "move --to of file"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--to", "origin", annexedfile] "move --to of file already there"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
inmainrepo $ unannexed ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--to", "origin", ingitfile] "move of ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
inmainrepo $ unannexed ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--from", "origin", ingitfile] "move of ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
inmainrepo $ unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
add a test case that move respects numcopies There is already one for drop, but move and drop don't handle numcopies exactly the same, and there was recently a reversion in it checking numcopies properly at all. This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 17:49:12 +00:00
test_move_numcopies :: Assertion
test_move_numcopies = intmpclonerepo $ do
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "numcopies" ["2"] "setting numcopies"
git_annex "move" ["--from", "origin", annexedfile] "move of file --from remote with numcopies unsatisfied but not made worse"
add a test case that move respects numcopies There is already one for drop, but move and drop don't handle numcopies exactly the same, and there was recently a reversion in it checking numcopies properly at all. This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 17:49:12 +00:00
annexed_present annexedfile
inmainrepo $ annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--to", "origin", annexedfile] "move of file --to remote with numcopies unsatisfied but not made worse"
add a test case that move respects numcopies There is already one for drop, but move and drop don't handle numcopies exactly the same, and there was recently a reversion in it checking numcopies properly at all. This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 17:49:12 +00:00
annexed_notpresent annexedfile
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
git_annex_shouldfail "move" ["--from", "origin", annexedfile] "move of file --from remote that violates numcopies setting not allowd"
git_annex_shouldfail "move" ["--to", "origin", annexedfile] "move of file --to remote that violates numcopies setting not allowed"
add a test case that move respects numcopies There is already one for drop, but move and drop don't handle numcopies exactly the same, and there was recently a reversion in it checking numcopies properly at all. This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 17:49:12 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_copy :: Assertion
test_copy = intmpclonerepo $ do
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--from", "origin", annexedfile] "copy --from of file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--from", "origin", annexedfile] "copy --from of file already here"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--to", "origin", annexedfile] "copy --to of file already there"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" ["--to", "origin", annexedfile] "move --to of file already there"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
inmainrepo $ unannexed ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--to", "origin", ingitfile] "copy of ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
unannexed ingitfile
inmainrepo $ unannexed ingitfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--from", "origin", ingitfile] "copy of ingitfile should be no-op"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
checkregularfile ingitfile
checkcontent ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_preferred_content :: Assertion
test_preferred_content = intmpclonerepo $ do
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
-- get/copy --auto looks only at numcopies when preferred content is not
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
-- set, and with 1 copy existing, does not get the file.
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" ["--auto", annexedfile] "get --auto of file with default preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--from", "origin", "--auto", annexedfile] "copy --auto --from of file with default preferred content"
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
annexed_notpresent annexedfile
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "wanted" [".", "standard"] "set expression to standard"
git_annex "group" [".", "client"] "set group to standard"
git_annex "get" ["--auto", annexedfile] "get --auto of file for client"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile] "drop of file"
git_annex "copy" ["--from", "origin", "--auto", annexedfile] "copy --auto --from of file for client"
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "ungroup" [".", "client"] "ungroup"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "wanted" [".", "standard"] "set expression to standard"
git_annex "group" [".", "manual"] "set group to manual"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
-- drop --auto with manual leaves the file where it is
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--auto", annexedfile] "drop --auto of file with manual preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile] "drop of file"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
-- copy/get --auto with manual does not get the file
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" ["--auto", annexedfile] "get --auto of file with manual preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" ["--from", "origin", "--auto", annexedfile] "copy --auto --from of file with manual preferred content"
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "ungroup" [".", "client"] "ungroup"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "wanted" [".", "exclude=*"] "set expression to exclude=*"
git_annex "get" [annexedfile] "get of file"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--auto", annexedfile] "drop --auto of file with exclude=*"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" ["--auto", annexedfile] "get --auto of file with exclude=*"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_lock :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_lock = intmpclonerepo $ do
unlock: Fix behavior when file content is not present.
2011-01-14 03:46:02 +00:00
annexed_notpresent annexedfile
regression test for fd55563b02dd8fedbb2420f440603be7192d94dc
2015-01-02 17:59:25 +00:00
-- regression test: unlock of newly added, not committed file
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
-- should not fail.
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent "newfile" "foo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["newfile"] "add new file"
git_annex "unlock" ["newfile"] "unlock on newly added, never committed file"
regression test for fd55563b02dd8fedbb2420f440603be7192d94dc
2015-01-02 17:59:25 +00:00
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [annexedfile] "unlock"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
unannexed annexedfile
-- write different content, to verify that lock
-- throws it away
changecontent annexedfile
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent annexedfile $ content annexedfile ++ "foo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "lock" [annexedfile] "lock without --force should not be allowed"
git_annex "lock" ["--force", annexedfile] "lock --force"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
-- The original content of an unlocked file is not always
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
-- preserved after modification, so re-get it.
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file after lock --force"
fix test file is locked here, so use right test.
2016-01-06 20:12:00 +00:00
annexed_present_locked annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [annexedfile] "unlock"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
unannexed annexedfile
changecontent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" [annexedfile] "add of modified file"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
runchecks [checkregularfile, checkwritable] annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
c <- readFile annexedfile
hlint tweaks Did all sources except Remotes/* and Command/*
2011-07-15 07:12:05 +00:00
assertEqual "content of modified file" c (changedcontent annexedfile)
Made the test suite significantly less noisy Only displaying git-annex and git command output when something went wrong. A few could still leak stderr. These include the couple of calls to readProcess, which reads stdin but lets stderr through. But they don't leak any usually, so probably only would when failing anyway. Currently, there is no excess output at all! This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 18:07:46 +00:00
git_annex_shouldfail "drop" [annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"drop with no known copy of modified file should not be allowed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
lock: Fix edge cases where data loss could occur in v6 mode. In the case where the pointer file is in place, and not the content of the object, lock's performNew was called with filemodified=True, which caused it to try to repopulate the object from an unmodified associated file, of which there were none. So, the content of the object got thrown away incorrectly. This was the cause (although not the root cause) of data loss in https://github.com/datalad/datalad/issues/1020 The same problem could also occur when the work tree file is modified, but the object is not, and lock is called with --force. Added a test case for this, since it's excercising the same code path and is easier to set up than the problem above. Note that this only occurred when the keys database did not have an inode cache recorded for the annex object. Normally, the annex object would be in there, but there are of course circumstances where the inode cache is out of sync with reality, since it's only a cache. Fixed by checking if the object is unmodified; if so we don't need to try to repopulate it. This does add an additional checksum to the unlock path, but it's already checksumming the worktree file in another case, so it doesn't slow it down overall. Further investigation found a similar problem occurred when smudge --clean is called on a file and the inode cache is not populated. cleanOldKeys deleted the unmodified old object file in this case. This was also fixed by checking if the object is unmodified. In general, use of getInodeCaches and sameInodeCache is potentially dangerous if the inode cache has not gotten populated for some reason. Better to use isUnmodified. I breifly auited other places that check the inode cache, and did not see any immediate problems, but it would be easy to miss this kind of problem.
2016-10-17 16:56:26 +00:00
-- Regression test: lock --force when work tree file
-- was modified lost the (unmodified) annex object.
-- (Only occurred when the keys database was out of sync.)
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
test_lock_force :: Assertion
test_lock_force = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "upgrade" [] "upgrade"
git_annex "get" [annexedfile] "get of file"
git_annex "unlock" [annexedfile] "unlock"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
annexeval $ do
renaming
2020-07-10 18:17:35 +00:00
Just k <- Annex.WorkTree.lookupKey (toRawFilePath annexedfile)
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
Database.Keys.removeInodeCaches k
Database.Keys.closeDb
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
liftIO . removeWhenExistsWith R.removeLink
more RawFilePath conversion nukeFile replaced with removeWhenExistsWith removeLink, which allows using RawFilePath. Utility.Directory cannot use RawFilePath since setup does not depend on posix. This commit was sponsored by Graham Spencer on Patreon.
2020-10-29 14:33:12 +00:00
=<< Annex.fromRepo Annex.Locations.gitAnnexKeysDbIndexCache
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
writecontent annexedfile "test_lock_force content"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "lock" [annexedfile] "lock of modified file should not be allowed"
git_annex "lock" ["--force", annexedfile] "lock --force of modified file"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
annexed_present_locked annexedfile
lock: Fix edge cases where data loss could occur in v6 mode. In the case where the pointer file is in place, and not the content of the object, lock's performNew was called with filemodified=True, which caused it to try to repopulate the object from an unmodified associated file, of which there were none. So, the content of the object got thrown away incorrectly. This was the cause (although not the root cause) of data loss in https://github.com/datalad/datalad/issues/1020 The same problem could also occur when the work tree file is modified, but the object is not, and lock is called with --force. Added a test case for this, since it's excercising the same code path and is easier to set up than the problem above. Note that this only occurred when the keys database did not have an inode cache recorded for the annex object. Normally, the annex object would be in there, but there are of course circumstances where the inode cache is out of sync with reality, since it's only a cache. Fixed by checking if the object is unmodified; if so we don't need to try to repopulate it. This does add an additional checksum to the unlock path, but it's already checksumming the worktree file in another case, so it doesn't slow it down overall. Further investigation found a similar problem occurred when smudge --clean is called on a file and the inode cache is not populated. cleanOldKeys deleted the unmodified old object file in this case. This was also fixed by checking if the object is unmodified. In general, use of getInodeCaches and sameInodeCache is potentially dangerous if the inode cache has not gotten populated for some reason. Better to use isUnmodified. I breifly auited other places that check the inode cache, and did not see any immediate problems, but it would be easy to miss this kind of problem.
2016-10-17 16:56:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_edit = test_edit' False
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit_precommit :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_edit_precommit = test_edit' True
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit' :: Bool -> Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_edit' precommit = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "edit" [annexedfile] "edit"
where indenting
2012-11-11 04:51:07 +00:00
unannexed annexedfile
changecontent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" [annexedfile] "git add of edited file"
where indenting
2012-11-11 04:51:07 +00:00
if precommit
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
then git_annex "pre-commit" [] "pre-commit"
else git "commit" ["-q", "-m", "contentchanged"] "git commit of edited file"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
runchecks [checkregularfile, checkwritable] annexedfile
where indenting
2012-11-11 04:51:07 +00:00
c <- readFile annexedfile
assertEqual "content of modified file" c (changedcontent annexedfile)
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile] "drop no known copy of modified file should not be allowed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_partial_commit :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_partial_commit = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index I had hoped that the git devs could change git's handling of partial commits to not use a false index file, but seems not. So, this relies on some git internals to detect that case. The test suite has a test case added to catch it if changes to git break it. This commit was sponsored by Paul Tagliamonte.
2014-11-10 19:36:24 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [annexedfile] "unlock"
fix test have to change the content of unlocked file before committing otherwise git commit will fail in v6 mode when the file was already unlocked, because no changes have been made
2016-01-06 20:14:51 +00:00
changecontent annexedfile
Made the test suite significantly less noisy Only displaying git-annex and git command output when something went wrong. A few could still leak stderr. These include the couple of calls to readProcess, which reads stdin but lets stderr through. But they don't leak any usually, so probably only would when failing anyway. Currently, there is no excess output at all! This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 18:07:46 +00:00
git "commit" ["-q", "-m", "test", annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"partial commit of unlocked file should be allowed"
pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index I had hoped that the git devs could change git's handling of partial commits to not use a false index file, but seems not. So, this relies on some git internals to detect that case. The test suite has a test case added to catch it if changes to git break it. This commit was sponsored by Paul Tagliamonte.
2014-11-10 19:36:24 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fix :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_fix = intmpclonerepo $ unlessM (hasUnlockedFiles <$> getTestMode) $ do
more
2011-01-07 18:08:43 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fix" [annexedfile] "fix of not present"
more
2011-01-07 18:08:43 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fix" [annexedfile] "fix of present file"
more
2011-01-07 18:08:43 +00:00
annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
createDirectory subdir
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "mv" [annexedfile, subdir] "git mv"
git_annex "fix" [newfile] "fix of moved file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
runchecks [checklink, checkunwritable] newfile
c <- readFile newfile
hlint tweaks Did all sources except Remotes/* and Command/*
2011-07-15 07:12:05 +00:00
assertEqual "content of moved file" c (content annexedfile)
where indenting
2012-11-11 04:51:07 +00:00
where
subdir = "s"
newfile = subdir ++ "/" ++ annexedfile
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_trust :: Assertion
test_trust = intmpclonerepo $ do
update test suite after git-annex trust behavior change
2021-01-11 17:14:58 +00:00
git_annex "trust" ["--force", repo] "trust"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.Trusted "trusted 1"
update test suite after git-annex trust behavior change
2021-01-11 17:14:58 +00:00
git_annex "trust" ["--force", repo] "trust of trusted"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.Trusted "trusted 2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "untrust" [repo] "untrust"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.UnTrusted "untrusted 1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "untrust" [repo] "untrust of untrusted"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.UnTrusted "untrusted 2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "dead" [repo] "dead"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
trustcheck Logs.Trust.DeadTrusted "deadtrusted 1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "dead" [repo] "dead of dead"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
trustcheck Logs.Trust.DeadTrusted "deadtrusted 2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "semitrust" [repo] "semitrust"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.SemiTrusted "semitrusted 1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "semitrust" [repo] "semitrust of semitrusted"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.SemiTrusted "semitrusted 2"
where indenting
2012-11-11 04:51:07 +00:00
where
repo = "origin"
trustcheck expected msg = do
present <- annexeval $ do
l <- Logs.Trust.trustGet expected
u <- Remote.nameToUUID repo
return $ u `elem` l
assertBool msg present
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fsck_basic :: Assertion
test_fsck_basic = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fsck" [] "fsck"
git_annex "numcopies" ["2"] "numcopies config"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
fsck_should_fail "numcopies unsatisfied"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "numcopies" ["1"] "numcopies config"
tasty fully working
2013-11-15 00:09:47 +00:00
corrupt annexedfile
corrupt sha1annexedfile
where indenting
2012-11-11 04:51:07 +00:00
where
corrupt f = do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [f] "get of file"
finished this stage of the RawFilePath conversion This commit was sponsored by Denis Dzyubenko on Patreon.
2020-11-06 18:10:58 +00:00
Utility.FileMode.allowWrite (toRawFilePath f)
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent f (changedcontent f)
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
ifM (hasUnlockedFiles <$> getTestMode)
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
( git_annex "fsck" []"fsck on unlocked file with changed file content"
, git_annex_shouldfail "fsck" [] "fsck with corrupted file content should error"
fsck behavior varies in direct mode when the file is modified
2013-05-17 19:20:21 +00:00
)
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fsck" [] "second fsck, after first fsck should have fixed problem"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fsck_bare :: Assertion
test_fsck_bare = intmpbareclonerepo $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fsck" [] "fsck"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fsck_localuntrusted :: Assertion
test_fsck_localuntrusted = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
git_annex "untrust" ["origin"] "untrust of origin repo"
git_annex "untrust" ["."] "untrust of current repo"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
fsck_should_fail "content only available in untrusted (current) repository"
update test suite after git-annex trust behavior change
2021-01-11 17:14:58 +00:00
git_annex "trust" ["--force", "."] "trust of current repo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fsck" [annexedfile] "fsck on file present in trusted repo"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fsck_remoteuntrusted :: Assertion
test_fsck_remoteuntrusted = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "numcopies" ["2"] "numcopies config"
git_annex "get" [annexedfile] "get"
git_annex "get" [sha1annexedfile] "get"
git_annex "fsck" [] "fsck with numcopies=2 and 2 copies"
git_annex "untrust" ["origin"] "untrust of origin"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
fsck_should_fail "content not replicated to enough non-untrusted repositories"
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113. The directory special remote was not affected in its normal configuration, since annex-directory is an absolute path normally. But it could fail when a relative path was used. The git remote was affected even when an absolute path to it was used in .git/config, since git-annex now converts all such paths to relative.
2015-04-18 17:36:12 +00:00
test_fsck_fromremote :: Assertion
test_fsck_fromremote = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "fsck" ["--from", "origin"] "fsck --from origin"
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113. The directory special remote was not affected in its normal configuration, since annex-directory is an absolute path normally. But it could fail when a relative path was used. The git remote was affected even when an absolute path to it was used in .git/config, since git-annex now converts all such paths to relative.
2015-04-18 17:36:12 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
fsck_should_fail :: String -> Assertion
test: display error messages from git-annex on unexpected failures .. but not on expected failures
2018-10-30 14:49:39 +00:00
fsck_should_fail m = git_annex_shouldfail "fsck" []
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
("fsck should not succeed with " ++ m)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_migrate = test_migrate' False
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate_via_gitattributes :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_migrate_via_gitattributes = test_migrate' True
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate' :: Bool -> Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_migrate' usegitattributes = intmpclonerepo $ do
where indenting
2012-11-11 04:51:07 +00:00
annexed_notpresent annexedfile
annexed_notpresent sha1annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "migrate" [annexedfile] "migrate of not present"
git_annex "migrate" [sha1annexedfile] "migrate of not present"
git_annex "get" [annexedfile] "get of file"
git_annex "get" [sha1annexedfile] "get of file"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
annexed_present sha1annexedfile
if usegitattributes
then do
more hlint
2014-02-11 05:35:11 +00:00
writeFile ".gitattributes" "* annex.backend=SHA1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [sha1annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"migrate sha1annexedfile"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"migrate annexedfile"
where indenting
2012-11-11 04:51:07 +00:00
else do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [sha1annexedfile, "--backend", "SHA1"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"migrate sha1annexedfile"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [annexedfile, "--backend", "SHA1"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"migrate annexedfile"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
annexed_present sha1annexedfile
checkbackend annexedfile backendSHA1
checkbackend sha1annexedfile backendSHA1
-- check that reversing a migration works
more hlint
2014-02-11 05:35:11 +00:00
writeFile ".gitattributes" "* annex.backend=SHA256"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "migrate" [sha1annexedfile] "migrate sha1annexedfile"
git_annex "migrate" [annexedfile] "migrate annexedfile"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
annexed_present sha1annexedfile
checkbackend annexedfile backendSHA256
checkbackend sha1annexedfile backendSHA256
test migrate; 75%
2011-01-12 01:11:32 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unused :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_unused = intmpclonerepo $ do
set annex.largefiles earlier in test suite The ingitfile was having git run it through the clean filter in some cases.
2015-12-30 17:29:00 +00:00
checkunused [] "in new clone"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
git_annex "get" [sha1annexedfile] "get of file"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
annexedfilekey <- getKey backendSHA256E annexedfile
sha1annexedfilekey <- getKey backendSHA1 sha1annexedfile
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after get"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "rm" ["-fq", annexedfile] "git rm"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after rm"
test: Add pass using adjusted unlocked branch On second thought, the extra time running the test suite is worth it. It will be gained back once we finally get rid of direct mode. There are two failing tests, same two that have been failing on windows (though the failure does not look identical). So this should also spare me the Windows VM while fixing.
2019-08-09 15:06:54 +00:00
-- commit the rm, and when on an adjusted branch, sync it back to
-- the master branch
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" ["--no-push", "--no-pull"] "git-annex sync"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after commit"
update test suite for smarter unused
2011-09-28 21:48:11 +00:00
-- unused checks origin/master; once it's gone it is really unused
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["rm", "origin"] "git remote rm origin"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [annexedfilekey] "after origin branches are gone"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "rm" ["-fq", sha1annexedfile] "git rm"
git_annex "sync" ["--no-push", "--no-pull"] "git-annex sync"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [annexedfilekey, sha1annexedfilekey] "after rm sha1annexedfile"
test unused et al
2011-01-12 05:58:23 +00:00
-- good opportunity to test dropkey also
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "dropkey" ["--force", Key.serializeKey annexedfilekey] "dropkey"
rename key2file and file2key What these generate is not really suitable to be used as a filename, which is why keyFile and fileKey further escape it. These are just serializing Keys. Also removed a quickcheck test that was very unlikely to test anything useful, since it relied on random chance creating something that looks like a serialized key. The other test is sufficient for testing what that was intended to test anyway.
2019-01-14 17:03:35 +00:00
checkunused [sha1annexedfilekey] ("after dropkey --force " ++ Key.serializeKey annexedfilekey)
test unused et al
2011-01-12 05:58:23 +00:00
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "dropunused" ["1"] "dropunused should not be allowed without --force"
git_annex "dropunused" ["--force", "1"] "dropunused"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after dropunused"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "dropunused" ["--force", "10", "501"] "dropunused on bogus numbers"
test unused et al
2011-01-12 05:58:23 +00:00
100% pass on FAT
2016-02-16 20:02:54 +00:00
-- Unused used to miss renamed symlinks that were not staged
-- and pointed at annexed content, and think that content was unused.
-- This is only relevant when using locked files; if the file is
-- unlocked, the work tree file has the content, and there's no way
-- to associate it with the key.
test: Add pass using adjusted unlocked branch On second thought, the extra time running the test suite is worth it. It will be gained back once we finally get rid of direct mode. There are two failing tests, same two that have been failing on windows (though the failure does not look identical). So this should also spare me the Windows VM while fixing.
2019-08-09 15:06:54 +00:00
unlessM (hasUnlockedFiles <$> getTestMode) $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent "unusedfile" "unusedcontent"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["unusedfile"] "add of unusedfile"
100% pass on FAT
2016-02-16 20:02:54 +00:00
unusedfilekey <- getKey backendSHA256E "unusedfile"
renameFile "unusedfile" "unusedunstagedfile"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "rm" ["-qf", "unusedfile"] "git rm"
100% pass on FAT
2016-02-16 20:02:54 +00:00
checkunused [] "with unstaged link"
removeFile "unusedunstagedfile"
checkunused [unusedfilekey] "with renamed link deleted"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
-- unused used to miss symlinks that were deleted or modified
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
-- manually
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent "unusedfile" "unusedcontent"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["unusedfile"] "add of unusedfile"
git "add" ["unusedfile"] "git add"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
unusedfilekey' <- getKey backendSHA256E "unusedfile"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkunused [] "with staged deleted link"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "rm" ["-qf", "unusedfile"] "git rm"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkunused [unusedfilekey'] "with staged link deleted"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
-- unused used to false positive on symlinks that were
-- deleted or modified manually, but not staged as such
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent "unusedfile" "unusedcontent"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["unusedfile"] "add of unusedfile"
git "add" ["unusedfile"] "git add"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
checkunused [] "with staged file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
removeFile "unusedfile"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
checkunused [] "with staged deleted file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
-- When an unlocked file is modified, git diff will cause git-annex
-- to add its content to the repository. Make sure that's not
-- found as unused.
test: Add pass using adjusted unlocked branch On second thought, the extra time running the test suite is worth it. It will be gained back once we finally get rid of direct mode. There are two failing tests, same two that have been failing on windows (though the failure does not look identical). So this should also spare me the Windows VM while fixing.
2019-08-09 15:06:54 +00:00
whenM (hasUnlockedFiles <$> getTestMode) $ do
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
let f = "unlockedfile"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent f "unlockedcontent1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" ["unlockedfile"] "git add"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
checkunused [] "with unlocked file before modification"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent f "unlockedcontent2"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
checkunused [] "with unlocked file after modification"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_shouldfail "diff" ["--quiet", f] "git diff should exit nonzero when unlocked file is modified"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
-- still nothing unused because one version is in the index
-- and the other is in the work tree
checkunused [] "with unlocked file after git diff"
where indenting
2012-11-11 04:51:07 +00:00
where
checkunused expectedkeys desc = do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unused" [] "unused"
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
unusedmap <- annexeval $ Logs.Unused.readUnusedMap mempty
where indenting
2012-11-11 04:51:07 +00:00
let unusedkeys = M.elems unusedmap
assertEqual ("unused keys differ " ++ desc)
(sort expectedkeys) (sort unusedkeys)
test unused et al
2011-01-12 05:58:23 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_describe :: Assertion
test_describe = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "describe" [".", "this repo"] "describe 1"
git_annex "describe" ["origin", "origin repo"] "describe 2"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_find :: Assertion
test_find = intmpclonerepo $ do
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" [] []
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
test coverage improvements
2011-12-21 06:32:40 +00:00
annexed_present annexedfile
annexed_notpresent sha1annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" [] [annexedfile]
git_annex_expectoutput "find" ["--exclude", annexedfile, "--and", "--exclude", sha1annexedfile] []
git_annex_expectoutput "find" ["--include", annexedfile] [annexedfile]
git_annex_expectoutput "find" ["--not", "--in", "origin"] []
git_annex_expectoutput "find" ["--copies", "1", "--and", "--not", "--copies", "2"] [sha1annexedfile]
git_annex_expectoutput "find" ["--inbackend", "SHA1"] [sha1annexedfile]
git_annex_expectoutput "find" ["--inbackend", "WORM"] []
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
fix * glob matching files in subdirectories
2013-02-26 17:49:22 +00:00
{- --include=* should match files in subdirectories too,
- and --exclude=* should exclude them. -}
createDirectory "dir"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent "dir/subfile" "subfile"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["dir"] "add of subdir"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--include", "*", "--exclude", annexedfile, "--exclude", sha1annexedfile] ["dir/subfile"]
git_annex_expectoutput "find" ["--exclude", "*"] []
fix * glob matching files in subdirectories
2013-02-26 17:49:22 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_merge :: Assertion
test_merge = intmpclonerepo $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "merge" [] "merge"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_info :: Assertion
test_info = intmpclonerepo $ do
Removed dependency on json library; all JSON is now handled by aeson. I've eyeballed all --json commands, and the only difference should be that some fields are re-ordered.
2016-07-26 23:15:34 +00:00
json <- BU8.fromString <$> git_annex_output "info" ["--json"]
Fix mangling of --json output of utf-8 characters when not running in a utf-8 locale As long as all code imports Utility.Aeson rather than Data.Aeson, and no Strings that may contain utf-8 characters are used for eg, object keys via T.pack, this is guaranteed to fix the problem everywhere that git-annex generates json. It's kind of annoying to need to wrap ToJSON with a ToJSON', especially since every data type that has a ToJSON instance has to be ported over. However, that only took 50 lines of code, which is worth it to ensure full coverage. I initially tried an alternative approach of a newtype FileEncoded, which had to be used everywhere a String was fed into aeson, and chasing down all the sites would have been far too hard. Did consider creating an intentionally overlapping instance ToJSON String, and letting ghc fail to build anything that passed in a String, but am not sure that wouldn't pollute some library that git-annex depends on that happens to use ToJSON String internally. This commit was supported by the NSF-funded DataLad project.
2018-04-16 19:42:45 +00:00
case Utility.Aeson.eitherDecode json :: Either String Utility.Aeson.Value of
Removed dependency on json library; all JSON is now handled by aeson. I've eyeballed all --json commands, and the only difference should be that some fields are re-ordered.
2016-07-26 23:15:34 +00:00
Right _ -> return ()
Left e -> assertFailure e
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_version :: Assertion
test_version = intmpclonerepo $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "version" [] "version"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_sync :: Assertion
test_sync = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
test case for recent sync --content reversion
2016-01-26 21:33:16 +00:00
{- Regression test for bug fixed in
- 039e83ed5d1a11fd562cce55b8429c840d72443e, where a present
- wanted file was dropped. -}
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get"
test case for recent sync --content reversion
2016-01-26 21:33:16 +00:00
git_annex_expectoutput "find" ["--in", "."] [annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "wanted" [".", "present"] "wanted"
git_annex "sync" ["--content"] "sync"
test case for recent sync --content reversion
2016-01-26 21:33:16 +00:00
git_annex_expectoutput "find" ["--in", "."] [annexedfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile] "drop"
test case for recent sync --content reversion
2016-01-26 21:33:16 +00:00
git_annex_expectoutput "find" ["--in", "."] []
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" ["--content"] "sync"
test case for recent sync --content reversion
2016-01-26 21:33:16 +00:00
git_annex_expectoutput "find" ["--in", "."] []
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
add regression test
2019-11-14 18:02:09 +00:00
{- Regression test for the concurrency bug fixed in
- 667d38a8f11c1ee8f256cdbd80e225c2bae06595 -}
test_concurrent_get_of_dup_key_regression :: Assertion
test_concurrent_get_of_dup_key_regression = intmpclonerepo $ do
makedup dupfile
-- This was sufficient currency to trigger the bug.
git_annex "get" ["-J1", annexedfile, dupfile]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"concurrent get -J1 with dup"
add regression test
2019-11-14 18:02:09 +00:00
git_annex "drop" ["-J1"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"drop with dup"
add regression test
2019-11-14 18:02:09 +00:00
-- With -J2, one more dup file was needed to trigger the bug.
makedup dupfile2
git_annex "get" ["-J2", annexedfile, dupfile, dupfile2]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"concurrent get -J2 with dup"
add regression test
2019-11-14 18:02:09 +00:00
git_annex "drop" ["-J2"]
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
"drop with dup"
add regression test
2019-11-14 18:02:09 +00:00
where
dupfile = annexedfile ++ "2"
dupfile2 = annexedfile ++ "3"
makedup f = do
Utility.CopyFile.copyFileExternal Utility.CopyFile.CopyAllMetaData annexedfile f
@? "copying annexed file failed"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" [f] "git add"
add regression test
2019-11-14 18:02:09 +00:00
add a test case for merge conflict automatic resolution
2013-05-20 19:51:40 +00:00
{- Regression test for union merge bug fixed in
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
- 0214e0fb175a608a49b812d81b4632c081f63027 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_union_merge_regression :: Assertion
test_union_merge_regression =
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
{- We need 3 repos to see this bug. -}
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
withtmpclonerepo $ \r3 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2, r3] $ \r -> indir r $ do
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r1) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["add", "r1", "../../" ++ r1] "remote add"
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r2) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["add", "r2", "../../" ++ r2] "remote add"
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r3) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["add", "r3", "../../" ++ r3] "remote add"
git_annex "get" [annexedfile] "get"
git "remote" ["rm", "origin"] "remote rm"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r3, r2, r1] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] ("sync in " ++ r)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r3, r2] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" ["--force", annexedfile] ("drop in " ++ r)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--in", "r3"] []
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
{- This was the bug. The sync
- mangled location log data and it
- thought the file was still in r2 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--in", "r2"] []
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
add a test case for merge conflict automatic resolution
2013-05-20 19:51:40 +00:00
{- Regression test for the automatic conflict resolution bug fixed
- in f4ba19f2b8a76a1676da7bb5850baa40d9c388e2. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution_movein_regression :: Assertion
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
test_conflict_resolution_movein_regression = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
let rname r = if r == r1 then "r1" else "r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Get all files, see check below. -}
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [] "get"
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Set up a conflict. -}
let newcontent = content annexedfile ++ rname r
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "unlock" [annexedfile] "unlock"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
writecontent annexedfile newcontent
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Sync twice in r1 so it gets the conflict resolution
- update from r2 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2, r1] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" ["--force"] ("sync in " ++ rname r)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- After the sync, it should be possible to get all
- files. This includes both sides of the conflict,
- although the filenames are not easily predictable.
-
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
- The bug caused one repo to be missing the content
- of the file that had been put in it. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2] $ \r -> indir r $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [] ("get all files after merge conflict resolution in " ++ rname r)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
more conflict resolution tests
2014-03-05 03:12:15 +00:00
{- Simple case of conflict resolution; 2 different versions of annexed
- file. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution :: Assertion
test_conflict_resolution =
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
more conflict resolution tests
2014-03-05 03:12:15 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
more conflict resolution tests
2014-03-05 03:12:15 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
more conflict resolution tests
2014-03-05 03:12:15 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
where
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
length v == 2
@? (what ++ " not exactly 2 variant files in: " ++ show l)
Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. I think this is a git behavior change, but have not checked to be sure. Conflict cruft used to look like $foo~HEAD, but now just $foo is left behind as conflict cruft. With test case.
2014-07-11 20:56:19 +00:00
conflictor `notElem` l @? ("conflictor still present after conflict resolution")
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir d $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" v "get"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" v v
more conflict resolution tests
2014-03-05 03:12:15 +00:00
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
{- Conflict resolution while in an adjusted branch. -}
test_conflict_resolution_adjusted_branch :: Assertion
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
test_conflict_resolution_adjusted_branch =
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
withtmpclonerepo $ \r1 ->
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
withtmpclonerepo $ \r2 -> whenM (adjustedbranchsupported r2) $ do
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
indir r1 $ do
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor1"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
indir r2 $ do
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor2"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r2"
fix recent test suite reversion git annex adjust --force will overwrite any current adjusted branch. I didn't document this because for the user, deleting the branch is just as good.
2016-05-23 15:23:30 +00:00
-- We might be in an adjusted branch
-- already, when eg on a crippled
-- filesystem. So, --force it.
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "adjust" ["--unlock", "--force"] "adjust"
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
where
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
length v == 2
@? (what ++ " not exactly 2 variant files in: " ++ show l)
conflictor `notElem` l @? ("conflictor still present after conflict resolution")
indir d $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" v "get"
add simple test for conflict resolution in adjusted branch This is not really extensive enough, but a start..
2016-04-12 17:01:31 +00:00
git_annex_expectoutput "find" v v
more conflict resolution tests
2014-03-05 03:12:15 +00:00
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Check merge conflict resolution when one side is an annexed
- file, and the other is a directory. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_mixed_conflict_resolution :: Assertion
test_mixed_conflict_resolution = do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
check True
check False
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
createDirectory conflictor
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent subfile "subfile"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
fix broken test 1c997fd08c04b27c9acb561a33c6fb2829089be7 broke the mixed conflict resolution test. Since origin is no longer involved, both sides have to sync after pairing. (The sync before pairing is just to get a commit.)
2014-02-03 18:32:07 +00:00
let l = if inr1 then [r1, r2] else [r2, r1]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync in mixed conflict"
fix broken test 1c997fd08c04b27c9acb561a33c6fb2829089be7 broke the mixed conflict resolution test. Since origin is no longer involved, both sides have to sync after pairing. (The sync before pairing is just to get a commit.)
2014-02-03 18:32:07 +00:00
checkmerge "r1" r1
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
checkmerge "r2" r2
narrowing test case
2014-02-04 19:14:16 +00:00
conflictor = "conflictor"
improved test for FAT symlink regressions The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
2014-03-04 17:23:47 +00:00
subfile = conflictor </> "subfile"
narrowing test case
2014-02-04 19:14:16 +00:00
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
doesDirectoryExist (d </> conflictor)
@? (d ++ " conflictor directory missing")
narrowing test case
2014-02-04 19:14:16 +00:00
l <- getDirectoryContents d
improved test for FAT symlink regressions The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
2014-03-04 17:23:47 +00:00
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
more conflict resolution tests
2014-03-05 03:12:15 +00:00
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir d $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" (conflictor:v) ("get in " ++ what)
all commands building except for assistant also, changed ConfigValue to a newtype, and moved it into Git.Config.
2019-12-05 18:36:43 +00:00
git_annex_expectoutput "find" [conflictor] [fromRawFilePath (Git.FilePath.toInternalGitPath (toRawFilePath subfile))]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" v v
narrowing test case
2014-02-04 19:14:16 +00:00
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
{- Check merge conflict resolution when both repos start with an annexed
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
- file; one modifies it, and the other deletes it. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_remove_conflict_resolution :: Assertion
test_remove_conflict_resolution = do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
check True
check False
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
disconnectOrigin
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
indir r2 $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync in r2"
git_annex "get" [conflictor] "get conflictor"
git_annex "unlock" [conflictor] "unlock conflictor"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "newconflictor"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $
finish fixing removeLink on windows 9cb250f7be21a8f5b15454df4fb67bfd1811e39d got the ones in RawFilePath, but there were others that used the one from unix-compat, which fails at runtime on windows. To avoid this, import System.PosixCompat.Files hiding removeLink This commit was sponsored by Ethan Aubin.
2020-11-24 16:38:12 +00:00
removeWhenExistsWith R.removeLink (toRawFilePath conflictor)
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
let l = if inr1 then [r1, r2, r1] else [r2, r1, r2]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
more conflict resolution tests
2014-03-05 03:12:15 +00:00
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
indent with tabs not spaces Found these with: git grep "^ " $(find -type f -name \*.hs) |grep -v ': where' Unfortunately there is some inline hamlet that cannot use tabs for indentation. Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm leaving it as-is.
2014-10-09 19:09:26 +00:00
{- Check merge confalict resolution when a file is annexed in one repo,
- and checked directly into git in the other repo.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_nonannexed_file_conflict_resolution :: Assertion
test_nonannexed_file_conflict_resolution = do
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
check True
check False
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
where
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
indir r1 $ do
disconnectOrigin
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
indir r2 $ do
disconnectOrigin
writecontent conflictor nonannexed_content
Made the test suite significantly less noisy Only displaying git-annex and git command output when something went wrong. A few could still leak stderr. These include the couple of calls to readProcess, which reads stdin but lets stderr through. But they don't leak any usually, so probably only would when failing anyway. Currently, there is no excess output at all! This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 18:07:46 +00:00
git "config"
[ "annex.largefiles"
, "exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
] "git config annex.largefiles"
git "add" [conflictor] "git add conflictor"
git_annex "sync" [] "sync in r2"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
pair r1 r2
let l = if inr1 then [r1, r2] else [r2, r1]
forM_ l $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
conflictor = "conflictor"
nonannexed_content = "nonannexed"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
@? (what ++ " conflictor variant file missing in: " ++ show l )
more conflict resolution tests
2014-03-05 03:12:15 +00:00
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
sync: Automatically resolve merge conflict between and annexed file and a regular git file. This is a new feature, it was not handled before, since it's a bit of an edge case. However, it can be handled exactly the same as a file/dir conflict, just leave the non-annexed item alone. While implementing this, the core resolveMerge' function got a lot simpler and clearer. Note especially that where before there was an asymetric call to stagefromdirectmergedir, now graftin is called symmetrically in both cases. And, in order to add that `graftin us`, the current branch needed to be known (if there is no current branch, there cannot be a merge conflict). This led to some cleanups of how autoMergeFrom behaved when there is no current branch. This commit was sponsored by Philippe Gauthier.
2014-03-04 21:45:11 +00:00
s <- catchMaybeIO (readFile (d </> conflictor))
s == Just nonannexed_content
@? (what ++ " wrong content for nonannexed file: " ++ show s)
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
{- Check merge conflict resolution when a file is annexed in one repo,
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
- and is a non-git-annex symlink in the other repo.
-
- Test can only run when coreSymlinks is supported, because git needs to
- be able to check out the non-git-annex symlink.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_nonannexed_symlink_conflict_resolution :: Assertion
test_nonannexed_symlink_conflict_resolution = do
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
check True
check False
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
where
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r2 ->
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
whenM (checkRepo (Types.coreSymlinks <$> Annex.getGitConfig) r1) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add conflicter"
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
disconnectOrigin
createSymbolicLink symlinktarget "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "add" [conflictor] "git add conflictor"
git_annex "sync" [] "sync in r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
let l = if inr1 then [r1, r2] else [r2, r1]
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
forM_ l $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
conflictor = "conflictor"
symlinktarget = "dummy-target"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
s <- catchMaybeIO (readSymbolicLink (d </> conflictor))
s == Just symlinktarget
@? (what ++ " wrong target for nonannexed symlink: " ++ show s)
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
{- Check merge conflict resolution when there is a local file,
- that is not staged or committed, that conflicts with what's being added
- from the remmote.
-
- Case 1: Remote adds file named conflictor; local has a file named
- conflictor.
-
- Case 2: Remote adds conflictor/file; local has a file named conflictor.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uncommitted_conflict_resolution :: Assertion
test_uncommitted_conflict_resolution = do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
check conflictor
check (conflictor </> "file")
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check remoteconflictor = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
disconnectOrigin
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
createDirectoryIfMissing True (fromRawFilePath (parentDir (toRawFilePath remoteconflictor)))
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent remoteconflictor annexedcontent
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
add_annex conflictor "add remoteconflicter"
git_annex "sync" [] "sync in r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor localcontent
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
-- this case is intentionally not handled
-- since the user can recover on their own easily
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
indir r2 $ git_annex_shouldfail "sync" [] "sync should not succeed"
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
conflictor = "conflictor"
localcontent = "local"
annexedcontent = "annexed"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
{- On Windows/FAT, repeated conflict resolution sometimes
- lost track of whether a file was a symlink.
add test case & fix conflict resolution bug on Windows & FAT Fix bug in automatic merge conflict resolution code when used on a filesystem not supporting symlinks, which resulted in it losing track of the symlink bit of annexed files. This was the underlying bug that was causing another test to fail, which got worked around in 1c997fd08c04b27c9acb561a33c6fb2829089be7. I've chosen to keep 2 separate test cases since the old test case only detected the problem accidentially. Test suite passes on FAT & in windows, as well as on proper unix systems. This commit was sponsored by Ellis Whitehead.
2014-02-04 19:31:53 +00:00
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution_symlink_bit :: Assertion
test: Add pass using adjusted unlocked branch On second thought, the extra time running the test suite is worth it. It will be gained back once we finally get rid of direct mode. There are two failing tests, same two that have been failing on windows (though the failure does not look identical). So this should also spare me the Windows VM while fixing.
2019-08-09 15:06:54 +00:00
test_conflict_resolution_symlink_bit = unlessM (hasUnlockedFiles <$> getTestMode) $
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
withtmpclonerepo $ \r3 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "sync" [] "sync in r1"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link conflictor "r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
createDirectory conflictor
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent (conflictor </> "subfile") "subfile"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "sync" [] "sync in r2"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link (conflictor </> "subfile") "r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r3 $ do
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "sync" [] "sync in r1"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link (conflictor </> "subfile") "r3"
where
narrowing test case
2014-02-04 19:14:16 +00:00
conflictor = "conflictor"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link f what = do
all commands building except for assistant also, changed ConfigValue to a newtype, and moved it into Git.Config.
2019-12-05 18:36:43 +00:00
git_annex_expectoutput "find" ["--include=*", f] [fromRawFilePath (Git.FilePath.toInternalGitPath (toRawFilePath f))]
add git ls-tree --long parser Not yet used, but allows getting the size of items in the tree fairly cheaply. I noticed that CmdLine.Seek uses ls-tree and the feeds the files into another long-running process to check their size. That would be an example of a place that might be sped up by using this. Although in that particular case, it only needs to know the size of unlocked files, not locked. And since enabling --long probably doubles the ls-tree runtime or more, the overhead of using it there may outwweigh the benefit.
2021-03-23 16:44:29 +00:00
l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles (Git.LsTree.LsTreeLong False) Git.Ref.headRef [f]
rename BlobType and add submodule to it This was badly named, it's a not a blob necessarily, but anything that a tree can refer to. Also removed the Show instance which was used for serialization to git format, instead use fmtTreeItemType. This commit was supported by the NSF-funded DataLad project.
2018-05-14 18:22:44 +00:00
all (\i -> Git.Types.toTreeItemType (Git.LsTree.mode i) == Just Git.Types.TreeSymlink) l
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
@? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
{- An unlocked file that conflicts with a locked file should be resolved
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
- in favor of the unlocked file, with no variant files, as long as they
- both point to the same key. -}
test_mixed_lock_conflict_resolution :: Assertion
test_mixed_lock_conflict_resolution =
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
indir r1 $ do
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "sync" [] "sync in r1"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
indir r2 $ do
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
disconnectOrigin
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "unlock" [conflictor] "unlock conflicter"
git_annex "sync" [] "sync in r2"
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
where
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
v7 for all repositories * Default to v7 for new repositories. * Automatically upgrade v5 repositories to v7.
2019-08-30 17:54:57 +00:00
checkmerge what d = indir d $ do
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
l <- getDirectoryContents "."
let v = filter (variantprefix `isPrefixOf`) l
length v == 0
@? (what ++ " not exactly 0 variant files in: " ++ show l)
conflictor `elem` l @? ("conflictor not present after conflict resolution")
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [conflictor] "get"
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
git_annex_expectoutput "find" [conflictor] [conflictor]
-- regular file because it's unlocked
checkregularfile conflictor
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
{- Regression test for a bad merge between two adjusted branch repos,
- where the same file is added to both independently. The bad merge
- emptied the whole tree. -}
test_adjusted_branch_merge_regression :: Assertion
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
test_adjusted_branch_merge_regression = do
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
withtmpclonerepo $ \r1 ->
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
withtmpclonerepo $ \r2 -> whenM (adjustedbranchsupported r1) $ do
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
pair r1 r2
setup r1
setup r2
checkmerge "r1" r1
checkmerge "r2" r2
where
conflictor = "conflictor"
avoid a FAT fail
2018-12-19 17:36:14 +00:00
setup r = indir r $ whensupported $ do
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
disconnectOrigin
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "upgrade" [] "upgrade"
git_annex "adjust" ["--unlock", "--force"] "adjust"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent conflictor "conflictor"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [conflictor] "add conflicter"
git_annex "sync" [] "sync"
avoid a FAT fail
2018-12-19 17:36:14 +00:00
checkmerge what d = indir d $ whensupported $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] ("sync should not work in " ++ what)
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
l <- getDirectoryContents "."
conflictor `elem` l
@? ("conflictor not present after merge in " ++ what)
avoid a FAT fail
2018-12-19 17:36:14 +00:00
-- Currently this fails on FAT, for unknown reasons not to
-- do with what it's intended to test.
whensupported = unlessM (annexeval Config.crippledFileSystem)
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 16:56:31 +00:00
add test case for sync_in_adjusted_branch_deleted_recently_added_files This commit was sponsored by Denis Dzyubenko on Patreon.
2016-10-11 18:22:49 +00:00
{- Regression test for a bug in adjusted branch syncing code, where adding
- a subtree to an existing tree lost files. -}
test_adjusted_branch_subtree_regression :: Assertion
test_adjusted_branch_subtree_regression =
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
withtmpclonerepo $ \r -> whenM (adjustedbranchsupported r) $ do
indir r $ do
disconnectOrigin
dix original branch determation when testing adjusted branches
2020-06-23 21:41:50 +00:00
origbranch <- annexeval origBranch
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "upgrade" [] "upgrade"
git_annex "adjust" ["--unlock", "--force"] "adjust"
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
createDirectoryIfMissing True "a/b/c"
writecontent "a/b/c/d" "foo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["a/b/c"] "add a/b/c"
git_annex "sync" [] "sync"
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
createDirectoryIfMissing True "a/b/x"
writecontent "a/b/x/y" "foo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["a/b/x"] "add a/b/x"
git_annex "sync" [] "sync"
git "checkout" [origbranch] "git checkout"
Fix test suite failure when git-annex test is not run inside a git repository Not the first time this kind of test suite breakage has happened.. It would be good to avoid somehow it looking up from .t and finding a git repo. But just running the test suite from time to time outside of git-annex would also let me notice these before the distribution packagers do. This commit was sponsored by mo on Patreon.
2018-11-05 17:27:16 +00:00
doesFileExist "a/b/x/y" @? ("a/b/x/y missing from master after adjusted branch sync")
add test case for sync_in_adjusted_branch_deleted_recently_added_files This commit was sponsored by Denis Dzyubenko on Patreon.
2016-10-11 18:22:49 +00:00
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
{- Set up repos as remotes of each other. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair :: FilePath -> FilePath -> Assertion
pair r1 r2 = forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
when (r /= r1) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["add", "r1", "../../" ++ r1] "remote add"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
when (r /= r2) $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "remote" ["add", "r2", "../../" ++ r2] "remote add"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_map :: Assertion
test_map = intmpclonerepo $ do
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
-- set descriptions, that will be looked for in the map
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "describe" [".", "this repo"] "describe 1"
git_annex "describe" ["origin", "origin repo"] "describe 2"
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
-- --fast avoids it running graphviz, not a build dependency
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "map" ["--fast"] "map"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uninit :: Assertion
test_uninit = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [] "get"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
-- any exit status is accepted; does abnormal exit
git_annex' (const True) "uninit" [] "uninit"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkregularfile annexedfile
doesDirectoryExist ".git" @? ".git vanished in uninit"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uninit_inbranch :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_uninit_inbranch = intmpclonerepo $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "checkout" ["git-annex"] "git checkout git-annex"
git_annex_shouldfail "uninit" [] "uninit should not succeed when git-annex branch is checked out"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_upgrade :: Assertion
test_upgrade = intmpclonerepo $
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "upgrade" [] "upgrade"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_whereis :: Assertion
test_whereis = intmpclonerepo $ do
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "whereis" [annexedfile] "whereis on non-present file"
git_annex "untrust" ["origin"] "untrust"
git_annex_shouldfail "whereis" [annexedfile] "whereis should exit nonzero on non-present file only present in untrusted repo"
git_annex "get" [annexedfile] "get"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "whereis" [annexedfile] "whereis on present file"
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_hook_remote :: Assertion
test_hook_remote = intmpclonerepo $ do
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words "foo type=hook encryption=none hooktype=foo") "initremote"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
createDirectory dir
git_config "annex.foo-store-hook" $
"cp $ANNEX_FILE " ++ loc
git_config "annex.foo-retrieve-hook" $
"cp " ++ loc ++ " $ANNEX_FILE"
git_config "annex.foo-remove-hook" $
"rm -f " ++ loc
git_config "annex.foo-checkpresent-hook" $
"if [ -e " ++ loc ++ " ]; then echo $ANNEX_KEY; fi"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "get" [annexedfile] "get of file"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] "copy --to hook remote"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] "drop"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" [annexedfile, "--from", "foo"] "move --from hook remote"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] "drop should not be allowed with numcopies=2"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
where indenting
2012-11-11 04:51:07 +00:00
where
dir = "dir"
loc = dir ++ "/$ANNEX_KEY"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_config k v = git "config" [k, v] "git config"
Windows: The test suite now passes on Windows (a few broken parts are disabled). Better to have a working test suite that doesn't test a few things than no working test suite. Most of the disabled stuff is because for some reason "git annex sync" doesn't work when run inside the test suite. Looks like PATH problems. The directory and rsync special remotes seem broken on Windows, or maybe the tests are. Pretty sure the hook special remote test is broken.
2013-06-18 20:12:43 +00:00
#else
-- this test doesn't work in Windows TODO
noop
#endif
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_directory_remote :: Assertion
test_directory_remote = intmpclonerepo $ do
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
createDirectory "dir"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words "foo type=directory encryption=none directory=dir") "initremote"
git_annex "get" [annexedfile] "get of file"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] "copy --to directory remote"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] "drop"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" [annexedfile, "--from", "foo"] "move --from directory remote"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] "drop should not be allowed with numcopies=2"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_rsync_remote :: Assertion
test_rsync_remote = intmpclonerepo $ do
don't test rsync special remote on windows git-annex no longer ships with rsync on windows so this will generally fail
2019-08-08 16:37:25 +00:00
#ifndef mingw32_HOST_OS
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
createDirectory "dir"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words "foo type=rsync encryption=none rsyncurl=dir") "initremote"
git_annex "get" [annexedfile] "get of file"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] "copy --to rsync remote"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] "drop"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" [annexedfile, "--from", "foo"] "move --from rsync remote"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] "drop should not be allowed with numcopies=2"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
fix windows build
2019-08-08 17:41:56 +00:00
#else
noop
don't test rsync special remote on windows git-annex no longer ships with rsync on windows so this will generally fail
2019-08-08 16:37:25 +00:00
#endif
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_bup_remote :: Assertion
fold Build/SysConfig.hs into BuildInfo via include This avoids warnings from stack about the module not being listed in the cabal file. So, the generated file is also renamed to Build/SysConfig. Note that the setup program seems to be cached despite these changes; I had to cabal clean to get cabal to update it so that Build/SysConfig was written. This commit was sponsored by Jochen Bartl on Patreon.
2017-12-14 16:46:57 +00:00
test_bup_remote = intmpclonerepo $ when BuildInfo.bup $ do
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
-- bup special remote needs an absolute path
dir <- fromRawFilePath <$> absPath (toRawFilePath "dir")
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
createDirectory dir
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words $ "foo type=bup encryption=none buprepo="++dir) "initremote"
git_annex "get" [annexedfile] "get of file"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] "copy --to bup remote"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] "drop"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--from", "foo"] "copy --from bup remote"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" [annexedfile, "--from", "foo"] "move --from bup remote"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
improve
2011-12-21 18:10:36 +00:00
-- gpg is not a build dependency, so only test when it's available
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_crypto :: Assertion
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_crypto = do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
testscheme "shared"
testscheme "hybrid"
testscheme "pubkey"
where
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
gpgcmd = Utility.Gpg.mkGpgCmd Nothing
relocate gpg test framework temp dir to outside repo The gitAnnexTmpOtherDir cleanup made it be deleted too early sometimes, and so the test suite failed. Also there was a report of a similar failure which likely had a similar cause and hopwfully this fixes that too.
2019-01-21 18:00:21 +00:00
testscheme scheme = do
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
abstmp <- fromRawFilePath <$> absPath (toRawFilePath tmpdir)
minimize lenth of path to gpg agent socket Considered using the system tmp dir rather than putting it inside .t/, but then if TEMP were set to a long path, that would be a problem. Relative path seems the best approach, and will always be nice and short. The only downside of it is, if git-annex somehow changes the cwd while running, it would break. But git-annex does not do that, and should never do that.
2020-03-26 17:04:24 +00:00
testscheme' scheme abstmp
Avoid a test suite failure when the environment does not let gpg be tested Due to eg, too long a path to the agent socket, caused by running gpg in a container where /run is not mounted, and/or some other gpg behavior like unnecessarily making relative paths to its home directory absolute.
2020-04-28 19:47:23 +00:00
testscheme' scheme abstmp = intmpclonerepo $ do
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
gpgtmp <- (</> "gpgtmp") . fromRawFilePath
<$> relPathCwdToFile (toRawFilePath abstmp)
relocate gpg test framework temp dir to outside repo The gitAnnexTmpOtherDir cleanup made it be deleted too early sometimes, and so the test suite failed. Also there was a report of a similar failure which likely had a similar cause and hopwfully this fixes that too.
2019-01-21 18:00:21 +00:00
createDirectoryIfMissing False gpgtmp
Avoid a test suite failure when the environment does not let gpg be tested Due to eg, too long a path to the agent socket, caused by running gpg in a container where /run is not mounted, and/or some other gpg behavior like unnecessarily making relative paths to its home directory absolute.
2020-04-28 19:47:23 +00:00
Utility.Gpg.testTestHarness gpgtmp gpgcmd
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
@? "test harness self-test failed"
Avoid a test suite failure when the environment does not let gpg be tested Due to eg, too long a path to the agent socket, caused by running gpg in a container where /run is not mounted, and/or some other gpg behavior like unnecessarily making relative paths to its home directory absolute.
2020-04-28 19:47:23 +00:00
void $ Utility.Gpg.testHarness gpgtmp gpgcmd $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
createDirectory "dir"
Made the test suite significantly less noisy Only displaying git-annex and git command output when something went wrong. A few could still leak stderr. These include the couple of calls to readProcess, which reads stdin but lets stderr through. But they don't leak any usually, so probably only would when failing anyway. Currently, there is no excess output at all! This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 18:07:46 +00:00
let initps =
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
[ "foo"
, "type=directory"
, "encryption=" ++ scheme
, "directory=dir"
, "highRandomQuality=false"
] ++ if scheme `elem` ["hybrid","pubkey"]
then ["keyid=" ++ Utility.Gpg.testKeyId]
else []
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" initps "initremote"
git_annex_shouldfail "initremote" initps "initremote should not work when run twice in a row"
git_annex "enableremote" initps "enableremote"
git_annex "enableremote" initps "enableremote when run twice in a row"
git_annex "get" [annexedfile] "get of file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] "copy --to encrypted remote"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
(c,k) <- annexeval $ do
uuid <- Remote.nameToUUID "foo"
rs <- Logs.Remote.readRemoteLog
renaming
2020-07-10 18:17:35 +00:00
Just k <- Annex.WorkTree.lookupKey (toRawFilePath annexedfile)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
return (fromJust $ M.lookup uuid rs, k)
let key = if scheme `elem` ["hybrid","pubkey"]
then Just $ Utility.Gpg.KeyIds [Utility.Gpg.testKeyId]
else Nothing
testEncryptedRemote scheme key c [k] @? "invalid crypto setup"
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] "drop"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "move" [annexedfile, "--from", "foo"] "move --from encrypted remote"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] "drop should not be allowed with numcopies=2"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
{- Ensure the configuration complies with the encryption scheme, and
- that all keys are encrypted properly for the given directory remote. -}
separate RemoteConfig parsing basically working Many special remotes are not updated yet and are commented out.
2020-01-14 16:35:08 +00:00
testEncryptedRemote scheme ks c keys = case Remote.Helper.Encryptable.extractCipher pc of
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
Just cip@Crypto.SharedCipher{} | scheme == "shared" && isNothing ks ->
checkKeys cip Nothing
Just cip@(Crypto.EncryptedCipher encipher v ks')
| checkScheme v && keysMatch ks' ->
checkKeys cip (Just v) <&&> checkCipher encipher ks'
_ -> return False
where
fix encryption of content to gcrypt and git-lfs Fix serious regression in gcrypt and encrypted git-lfs remotes. Since version 7.20200202.7, git-annex incorrectly stored content on those remotes without encrypting it. Problem was, Remote.Git enumerates all git remotes, including git-lfs and gcrypt. It then dispatches to those. So, Remote.List used the RemoteConfigParser from Remote.Git, instead of from git-lfs or gcrypt, and that parser does not know about encryption fields, so did not include them in the ParsedRemoteConfig. (Also didn't include other fields specific to those remotes, perhaps chunking etc also didn't get through.) To fix, had to move RemoteConfig parsing down into the generate methods of each remote, rather than doing it in Remote.List. And a consequence of that was that ParsedRemoteConfig had to change to include the RemoteConfig that got parsed, so that testremote can generate a new remote based on an existing remote. (I would have rather fixed this just inside Remote.Git, but that was not practical, at least not w/o re-doing work that Remote.List already did. Big ugly mostly mechanical patch seemed preferable to making git-annex slower.)
2020-02-26 21:20:56 +00:00
pc = either (const (Types.Remote.ParsedRemoteConfig mempty mempty)) id $
separate RemoteConfig parsing basically working Many special remotes are not updated yet and are commented out.
2020-01-14 16:35:08 +00:00
Remote.Helper.Encryptable.parseEncryptionConfig c
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
keysMatch (Utility.Gpg.KeyIds ks') =
maybe False (\(Utility.Gpg.KeyIds ks2) ->
sort (nub ks2) == sort (nub ks')) ks
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
checkCipher encipher = Utility.Gpg.checkEncryptionStream gpgcmd encipher . Just
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkScheme Types.Crypto.Hybrid = scheme == "hybrid"
checkScheme Types.Crypto.PubKey = scheme == "pubkey"
checkKeys cip mvariant = do
add annex-ignore-command and annex-sync-command configs Added remote configuration settings annex-ignore-command and annex-sync-command, which are dynamic equivilants of the annex-ignore and annex-sync configurations. For this I needed a new DynamicConfig infrastructure. Its implementation should be as fast as before when there is no dynamic config, and it caches so shell commands are only run once. Note that annex-ignore-command exits nonzero when the remote should be ignored. While that may seem backwards, it allows using the same command for it as for annex-sync-command when you want to disable both. This commit was sponsored by Trenton Cronholm on Patreon.
2017-08-17 16:26:14 +00:00
dummycfg <- Types.GitConfig.dummyRemoteGitConfig
fix encryption of content to gcrypt and git-lfs Fix serious regression in gcrypt and encrypted git-lfs remotes. Since version 7.20200202.7, git-annex incorrectly stored content on those remotes without encrypting it. Problem was, Remote.Git enumerates all git remotes, including git-lfs and gcrypt. It then dispatches to those. So, Remote.List used the RemoteConfigParser from Remote.Git, instead of from git-lfs or gcrypt, and that parser does not know about encryption fields, so did not include them in the ParsedRemoteConfig. (Also didn't include other fields specific to those remotes, perhaps chunking etc also didn't get through.) To fix, had to move RemoteConfig parsing down into the generate methods of each remote, rather than doing it in Remote.List. And a consequence of that was that ParsedRemoteConfig had to change to include the RemoteConfig that got parsed, so that testremote can generate a new remote based on an existing remote. (I would have rather fixed this just inside Remote.Git, but that was not practical, at least not w/o re-doing work that Remote.List already did. Big ugly mostly mechanical patch seemed preferable to making git-annex slower.)
2020-02-26 21:20:56 +00:00
let encparams = (Types.Remote.ParsedRemoteConfig mempty mempty, dummycfg)
plumb RemoteGitConfig through to decryptCipher
2016-05-23 21:27:15 +00:00
cipher <- Crypto.decryptCipher gpgcmd encparams cip
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
files <- filterM doesFileExist $
rename key2file and file2key What these generate is not really suitable to be used as a filename, which is why keyFile and fileKey further escape it. These are just serializing Keys. Also removed a quickcheck test that was very unlikely to test anything useful, since it relied on random chance creating something that looks like a serialized key. The other test is sufficient for testing what that was intended to test anyway.
2019-01-14 17:03:35 +00:00
map ("dir" </>) $ concatMap (serializeKeys cipher) keys
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
return (not $ null files) <&&> allM (checkFile mvariant) files
checkFile mvariant filename =
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
Utility.Gpg.checkEncryptionFile gpgcmd filename $
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
if mvariant == Just Types.Crypto.PubKey then ks else Nothing
use filepath-bytestring for annex object manipulations git-annex find is now RawFilePath end to end, no string conversions. So is git-annex get when it does not need to get anything. So this is a major milestone on optimisation. Benchmarks indicate around 30% speedup in both commands. Probably many other performance improvements. All or nearly all places where a file is statted use RawFilePath now.
2019-12-11 18:12:22 +00:00
serializeKeys cipher = map fromRawFilePath .
Annex.Locations.keyPaths .
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
Crypto.encryptKey Types.Crypto.HmacSha1 cipher
can't test gpg on Windows yet
2013-05-17 20:49:34 +00:00
#else
fix windows build
2014-12-30 21:02:51 +00:00
test_crypto = putStrLn "gpg testing not implemented on Windows"
can't test gpg on Windows yet
2013-05-17 20:49:34 +00:00
#endif
test encrypted special remote This involved adding a test harness to run gpg with a dummy key, and lots of fun.
2011-12-21 03:20:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add_subdirs :: Assertion
test_add_subdirs = intmpclonerepo $ do
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
createDirectory "dir"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent ("dir" </> "foo") $ "dir/" ++ content annexedfile
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["dir"] "add of subdir"
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
{- Regression test for Windows bug where symlinks were not
- calculated correctly for files in subdirs. -}
test: Add pass using adjusted unlocked branch On second thought, the extra time running the test suite is worth it. It will be gained back once we finally get rid of direct mode. There are two failing tests, same two that have been failing on windows (though the failure does not look identical). So this should also spare me the Windows VM while fixing.
2019-08-09 15:06:54 +00:00
unlessM (hasUnlockedFiles <$> getTestMode) $ do
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" [] "sync"
strict bytestring encoders and decoders Only had lazy ones before. Already sped up a few parts of the code.
2019-01-01 18:54:06 +00:00
l <- annexeval $ Utility.FileSystemEncoding.decodeBL
Ref ByteString conversion done Test suite passes.
2020-04-07 21:41:09 +00:00
<$> Annex.CatFile.catObject (Git.Types.Ref (encodeBS "HEAD:dir/foo"))
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 19:30:59 +00:00
"../.git/annex/" `isPrefixOf` l @? ("symlink from subdir to .git/annex is wrong: " ++ l)
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
createDirectory "dir2"
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent ("dir2" </> "foo") $ content annexedfile
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
setCurrentDirectory "dir"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" [".." </> "dir2"] "add of ../subdir"
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
test case for addurl file://
2015-02-10 19:20:07 +00:00
test_addurl :: Assertion
test_addurl = intmpclonerepo $ do
-- file:// only; this test suite should not hit the network
limit url downloads to whitelisted schemes Security fix! Allowing any schemes, particularly file: and possibly others like scp: allowed file exfiltration by anyone who had write access to the git repository, since they could add an annexed file using such an url, or using an url that redirected to such an url, and wait for the victim to get it into their repository and send them a copy. * Added annex.security.allowed-url-schemes setting, which defaults to only allowing http and https URLs. Note especially that file:/ is no longer enabled by default. * Removed annex.web-download-command, since its interface does not allow supporting annex.security.allowed-url-schemes across redirects. If you used this setting, you may want to instead use annex.web-options to pass options to curl. With annex.web-download-command removed, nearly all url accesses in git-annex are made via Utility.Url via http-client or curl. http-client only supports http and https, so no problem there. (Disabling one and not the other is not implemented.) Used curl --proto to limit the allowed url schemes. Note that this will cause git annex fsck --from web to mark files using a disallowed url scheme as not being present in the web. That seems acceptable; fsck --from web also does that when a web server is not available. youtube-dl already disabled file: itself (probably for similar reasons). The scheme check was also added to youtube-dl urls for completeness, although that check won't catch any redirects it might follow. But youtube-dl goes off and does its own thing with other protocols anyway, so that's fine. Special remotes that support other domain-specific url schemes are not affected by this change. In the bittorrent remote, aria2c can still download magnet: links. The download of the .torrent file is otherwise now limited by annex.security.allowed-url-schemes. This does not address any external special remotes that might download an url themselves. Current thinking is all external special remotes will need to be audited for this problem, although many of them will use http libraries that only support http and not curl's menagarie. The related problem of accessing private localhost and LAN urls is not addressed by this commit. This commit was sponsored by Brett Eisenberg on Patreon.
2018-06-15 20:52:24 +00:00
let filecmd c ps = git_annex c ("-cannex.security.allowed-url-schemes=file" : ps)
finished this stage of the RawFilePath conversion Finally compiles again, and test suite passes. This commit was sponsored by Brock Spratlen on Patreon.
2020-11-04 18:20:37 +00:00
f <- fromRawFilePath <$> absPath (toRawFilePath "myurl")
dropdrive drops the leading slash, so need fil:///
2015-02-11 16:22:43 +00:00
let url = replace "\\" "/" ("file:///" ++ dropDrive f)
add small delay to avoid problems on systems with low-resolution mtime I've seen intermittent failures of the test suite with v6 for a long time, it seems to have possibly gotten worse with the changes around v7. Or just being unlucky; all tests failed today. Seen on amd64 and i386 builders, repeatedly but intermittently: unused: FAIL (4.86s) Test.hs:928: git diff did not show changes to unlocked file And I think other such failures, all involving v7/v6 mode tests. I managed to reproduce the unused failure with --keep-failures, and inside the repo, git diff was indeed not showing any changes for the modified unlocked file. The two stats will be the same other than mtime; the old and new files have the same size and inode, since the test case writes to the file and then overwrites it. Indeed, notice the identical timestamps: builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.894942036 +0000 Change: 2018-10-29 22:14:10.894942036 +0000 Birth: - File: foo Size: 2 Blocks: 8 IO Block: 4096 regular file Device: 801h/2049d Inode: 3546179 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ builder) Gid: ( 1000/ builder) Access: 2018-10-29 22:14:10.894942036 +0000 Modify: 2018-10-29 22:14:10.898942036 +0000 Change: 2018-10-29 22:14:10.898942036 +0000 Birth: - I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also not experienced the intermittent test suite failures on my laptop. So, I hope that this small delay will avoid the problem. Update: I didn't, indeed I then reproduced the same failure on my laptop, so it must be due to something else. But keeping this change anyway since not needing to worry about lowish-resolution mtime in the test suite seems worthwhile.
2018-10-29 22:42:20 +00:00
writecontent f "foo"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "addurl" [url] "addurl should not work on file url"
filecmd "addurl" [url] ("addurl on " ++ url)
test case for addurl file://
2015-02-10 19:20:07 +00:00
let dest = "addurlurldest"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
filecmd "addurl" ["--file", dest, url] ("addurl on " ++ url ++ " with --file")
test case for addurl file://
2015-02-10 19:20:07 +00:00
doesFileExist dest @? (dest ++ " missing after addurl --file")
add export+import test case
2019-03-06 20:49:33 +00:00
test_export_import :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_export_import = intmpclonerepo $ do
add export+import test case
2019-03-06 20:49:33 +00:00
createDirectory "dir"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words "foo type=directory encryption=none directory=dir exporttree=yes importtree=yes") "initremote"
git_annex "get" [] "get of files"
add export+import test case
2019-03-06 20:49:33 +00:00
annexed_present annexedfile
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
-- Nothing to commit, but this makes sure the master branch
-- is in sync with the adjusted branch, which it may not be
-- depending on how the repository was set up.
commitchanges
dix original branch determation when testing adjusted branches
2020-06-23 21:41:50 +00:00
origbranch <- annexeval origBranch
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "export" [origbranch, "--to", "foo"] "export to dir"
add export+import test case
2019-03-06 20:49:33 +00:00
dircontains annexedfile (content annexedfile)
writedir "import" (content "import")
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" [origbranch, "--from", "foo"] "import from dir"
git_annex "merge" ["foo/" ++ origbranch] "git annex merge"
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
annexed_present_imported "import"
add export+import test case
2019-03-06 20:49:33 +00:00
finish fixing removeLink on windows 9cb250f7be21a8f5b15454df4fb67bfd1811e39d got the ones in RawFilePath, but there were others that used the one from unix-compat, which fails at runtime on windows. To avoid this, import System.PosixCompat.Files hiding removeLink This commit was sponsored by Ethan Aubin.
2020-11-24 16:38:12 +00:00
removeWhenExistsWith R.removeLink (toRawFilePath "import")
add export+import test case
2019-03-06 20:49:33 +00:00
writecontent "import" (content "newimport1")
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["import"] "add of import"
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
commitchanges
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "export" [origbranch, "--to", "foo"] "export modified file to dir"
add export+import test case
2019-03-06 20:49:33 +00:00
dircontains "import" (content "newimport1")
-- verify that export refuses to overwrite modified file
writedir "import" (content "newimport2")
finish fixing removeLink on windows 9cb250f7be21a8f5b15454df4fb67bfd1811e39d got the ones in RawFilePath, but there were others that used the one from unix-compat, which fails at runtime on windows. To avoid this, import System.PosixCompat.Files hiding removeLink This commit was sponsored by Ethan Aubin.
2020-11-24 16:38:12 +00:00
removeWhenExistsWith R.removeLink (toRawFilePath "import")
add export+import test case
2019-03-06 20:49:33 +00:00
writecontent "import" (content "newimport3")
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["import"] "add of import"
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
commitchanges
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex_shouldfail "export" [origbranch, "--to", "foo"] "export should not work in conflict"
add export+import test case
2019-03-06 20:49:33 +00:00
dircontains "import" (content "newimport2")
-- resolving import conflict
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" [origbranch, "--from", "foo"] "import from dir"
git_shouldfail "merge" ["foo/master", "-mmerge"] "git merge of conflict should exit nonzero"
finish fixing removeLink on windows 9cb250f7be21a8f5b15454df4fb67bfd1811e39d got the ones in RawFilePath, but there were others that used the one from unix-compat, which fails at runtime on windows. To avoid this, import System.PosixCompat.Files hiding removeLink This commit was sponsored by Ethan Aubin.
2020-11-24 16:38:12 +00:00
removeWhenExistsWith R.removeLink (toRawFilePath "import")
add export+import test case
2019-03-06 20:49:33 +00:00
writecontent "import" (content "newimport3")
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "add" ["import"] "add of import"
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
commitchanges
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "export" [origbranch, "--to", "foo"] "export after import conflict"
add export+import test case
2019-03-06 20:49:33 +00:00
dircontains "import" (content "newimport3")
where
dircontains f v =
((v==) <$> readFile ("dir" </> f))
@? ("did not find expected content of " ++ "dir" </> f)
writedir f = writecontent ("dir" </> f)
make test_export_import work on adjusted branch
2019-08-09 17:33:29 +00:00
-- When on an adjusted branch, this updates the master branch
-- to match it, which is necessary since the master branch is going
-- to be exported.
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
commitchanges = git_annex "sync" ["--no-pull", "--no-push"] "sync"
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
test_export_import_subdir :: Assertion
update test suite for removal of direct mode Removed that pass and all the complications of checking direct mode's edge cases.
2019-08-26 19:07:10 +00:00
test_export_import_subdir = intmpclonerepo $ do
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
createDirectory "dir"
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "initremote" (words "foo type=directory encryption=none directory=dir exporttree=yes importtree=yes") "initremote"
git_annex "get" [] "get of files"
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
annexed_present annexedfile
createDirectory subdir
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git "mv" [annexedfile, subannexedfile] "git mv"
git "commit" ["-m", "moved"] "git commit"
work around adjusted unlocked branch problem in test suite
2019-08-08 17:28:04 +00:00
-- When on an adjusted branch, this updates the master branch
-- to match it, which is necessary since the master branch is going
-- to be exported.
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "sync" ["--no-pull", "--no-push"] "sync"
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
-- Run three times because there was a bug that took a couple
-- of runs to lead to the wrong tree being written to the remote
-- tracking branch.
testimport
testexport
testimport
testexport
testimport
testexport
where
dircontains f v =
((v==) <$> readFile ("dir" </> f))
@? ("did not find expected content of " ++ "dir" </> f)
subdir = "subdir"
subannexedfile = "subdir" </> annexedfile
testexport = do
dix original branch determation when testing adjusted branches
2020-06-23 21:41:50 +00:00
origbranch <- annexeval origBranch
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "export" [origbranch++":"++subdir, "--to", "foo"] "export of subdir"
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
dircontains annexedfile (content annexedfile)
testimport = do
dix original branch determation when testing adjusted branches
2020-06-23 21:41:50 +00:00
origbranch <- annexeval origBranch
improve display of test failures Display the transcript as part of the failure message for the assertion. This avoids scrambling the tasty display. This commit was sponsored by Ethan Aubin on Patreon.
2020-11-24 21:17:09 +00:00
git_annex "import" [origbranch++":"++subdir, "--from", "foo"] "import of subdir"
git_annex "merge" ["foo/master"] "git annex merge foo/master"
test case for bf7ecd6892d645b0d8139c0a62e2d5b398774ae5
2019-05-06 18:24:42 +00:00
-- Make sure that import did not import the file to the top
-- of the repo.
checkdoesnotexist annexedfile
Reference in a new issue Copy permalink