2011-01-07 00:09:49 +00:00
|
|
|
{- git-annex test suite
|
|
|
|
|
-
|
2020-05-21 19:26:32 +00:00
|
|
|
- Copyright 2010-2020 Joey Hess <id@joeyh.name>
|
2011-01-07 00:09:49 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2011-01-07 00:09:49 +00:00
|
|
|
-}
|
|
|
|
|
|
2013-05-17 20:45:44 +00:00
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
|
|
2013-02-27 19:35:07 +00:00
|
|
|
module Test where
|
|
|
|
|
|
2016-01-06 17:44:12 +00:00
|
|
|
import Types.Test
|
2018-10-25 21:23:53 +00:00
|
|
|
import Types.RepoVersion
|
2018-02-18 15:48:48 +00:00
|
|
|
import Test.Framework
|
2015-07-13 17:19:20 +00:00
|
|
|
import Options.Applicative.Types
|
|
|
|
|
|
2013-08-06 04:12:06 +00:00
|
|
|
import Test.Tasty
|
|
|
|
|
import Test.Tasty.Runners
|
|
|
|
|
import Test.Tasty.HUnit
|
|
|
|
|
import Test.Tasty.QuickCheck
|
2014-01-27 18:22:44 +00:00
|
|
|
import Test.Tasty.Ingredients.Rerun
|
2020-05-21 19:26:32 +00:00
|
|
|
import Test.Tasty.Options
|
2017-03-17 23:13:52 +00:00
|
|
|
import Options.Applicative (switch, long, help, internal)
|
2011-04-25 19:28:41 +00:00
|
|
|
|
2011-01-12 05:58:23 +00:00
|
|
|
import qualified Data.Map as M
|
2016-07-26 23:15:34 +00:00
|
|
|
import qualified Data.ByteString.Lazy.UTF8 as BU8
|
2017-08-14 20:27:35 +00:00
|
|
|
import System.Environment
|
2020-04-30 16:59:20 +00:00
|
|
|
import Control.Concurrent.STM hiding (check)
|
2010-11-02 21:08:16 +00:00
|
|
|
|
2011-10-04 02:24:57 +00:00
|
|
|
import Common
|
2017-03-17 23:13:52 +00:00
|
|
|
import CmdLine.GitAnnex.Options
|
2011-08-22 20:14:12 +00:00
|
|
|
|
2011-10-04 02:24:57 +00:00
|
|
|
import qualified Utility.SafeCommand
|
2011-01-11 19:43:29 +00:00
|
|
|
import qualified Annex
|
2011-12-13 19:22:43 +00:00
|
|
|
import qualified Git.Filename
|
2014-02-07 00:33:30 +00:00
|
|
|
import qualified Git.Types
|
2014-03-04 18:31:26 +00:00
|
|
|
import qualified Git.Ref
|
|
|
|
|
import qualified Git.LsTree
|
2014-03-04 19:06:40 +00:00
|
|
|
import qualified Git.FilePath
|
2016-01-20 20:36:33 +00:00
|
|
|
import qualified Annex.Locations
|
2017-10-24 16:24:06 +00:00
|
|
|
#ifndef mingw32_HOST_OS
|
2017-08-17 16:26:14 +00:00
|
|
|
import qualified Types.GitConfig
|
2017-10-24 16:24:06 +00:00
|
|
|
#endif
|
2012-12-20 03:43:15 +00:00
|
|
|
import qualified Types.TrustLevel
|
2011-01-26 01:49:04 +00:00
|
|
|
import qualified Types
|
2014-03-15 17:44:31 +00:00
|
|
|
import qualified Logs.MapLog
|
2011-10-15 20:21:08 +00:00
|
|
|
import qualified Logs.Trust
|
|
|
|
|
import qualified Logs.Remote
|
2012-05-06 00:11:08 +00:00
|
|
|
import qualified Logs.Unused
|
2012-12-19 20:15:39 +00:00
|
|
|
import qualified Logs.Transfer
|
2012-12-20 02:14:12 +00:00
|
|
|
import qualified Logs.Presence
|
2019-02-21 16:22:50 +00:00
|
|
|
import qualified Logs.ContentIdentifier
|
2015-06-17 17:49:29 +00:00
|
|
|
import qualified Logs.PreferredContent
|
2014-02-12 21:54:28 +00:00
|
|
|
import qualified Types.MetaData
|
2011-03-27 20:58:28 +00:00
|
|
|
import qualified Remote
|
2017-02-24 17:42:30 +00:00
|
|
|
import qualified Key
|
2013-05-15 21:44:30 +00:00
|
|
|
import qualified Config
|
2013-03-13 20:16:01 +00:00
|
|
|
import qualified Config.Cost
|
2011-04-21 20:56:24 +00:00
|
|
|
import qualified Crypto
|
2017-08-14 19:11:42 +00:00
|
|
|
import qualified Database.Keys
|
2015-12-15 19:34:28 +00:00
|
|
|
import qualified Annex.WorkTree
|
2014-01-26 20:36:31 +00:00
|
|
|
import qualified Annex.Init
|
2014-02-07 00:33:30 +00:00
|
|
|
import qualified Annex.CatFile
|
2016-02-16 20:29:04 +00:00
|
|
|
import qualified Annex.Path
|
2017-08-14 17:55:38 +00:00
|
|
|
import qualified Annex.VectorClock
|
2019-08-15 17:54:05 +00:00
|
|
|
import qualified Annex.AdjustedBranch
|
2014-02-16 21:39:54 +00:00
|
|
|
import qualified Annex.View
|
2014-02-22 18:54:53 +00:00
|
|
|
import qualified Annex.View.ViewedFile
|
2014-02-18 21:38:23 +00:00
|
|
|
import qualified Logs.View
|
2020-04-29 19:48:09 +00:00
|
|
|
import qualified Command.TestRemote
|
2011-08-22 20:14:12 +00:00
|
|
|
import qualified Utility.Path
|
2011-09-28 19:17:45 +00:00
|
|
|
import qualified Utility.FileMode
|
2017-12-14 16:46:57 +00:00
|
|
|
import qualified BuildInfo
|
2011-12-23 00:14:35 +00:00
|
|
|
import qualified Utility.Format
|
2012-09-08 03:23:52 +00:00
|
|
|
import qualified Utility.Verifiable
|
2012-10-11 17:45:09 +00:00
|
|
|
import qualified Utility.Process
|
2012-10-16 02:22:40 +00:00
|
|
|
import qualified Utility.Misc
|
2013-02-14 20:17:40 +00:00
|
|
|
import qualified Utility.InodeCache
|
2013-05-11 22:23:41 +00:00
|
|
|
import qualified Utility.Env
|
2017-12-31 20:08:31 +00:00
|
|
|
import qualified Utility.Env.Set
|
2013-05-25 01:33:54 +00:00
|
|
|
import qualified Utility.Matcher
|
2013-11-14 21:03:49 +00:00
|
|
|
import qualified Utility.Hash
|
|
|
|
|
import qualified Utility.Scheduled
|
2015-11-17 19:49:22 +00:00
|
|
|
import qualified Utility.Scheduled.QuickCheck
|
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
|
2017-12-31 20:08:31 +00:00
|
|
|
import qualified Utility.Tmp.Dir
|
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
|
2019-11-14 18:02:09 +00:00
|
|
|
import qualified Utility.CopyFile
|
2020-07-02 16:18:42 +00:00
|
|
|
import qualified Types.Remote
|
2014-10-16 19:54:02 +00:00
|
|
|
#ifndef mingw32_HOST_OS
|
2013-11-14 21:03:49 +00:00
|
|
|
import qualified Remote.Helper.Encryptable
|
|
|
|
|
import qualified Types.Crypto
|
|
|
|
|
import qualified Utility.Gpg
|
2013-05-17 20:51:46 +00:00
|
|
|
#endif
|
2010-11-02 20:49:35 +00:00
|
|
|
|
2016-01-06 17:44:12 +00:00
|
|
|
optParser :: Parser TestOptions
|
|
|
|
|
optParser = TestOptions
|
2020-05-21 19:26:32 +00:00
|
|
|
<$> snd tastyParser
|
2016-01-06 17:44:12 +00:00
|
|
|
<*> switch
|
|
|
|
|
( long "keep-failures"
|
|
|
|
|
<> help "preserve repositories on test failure"
|
2017-03-17 23:13:52 +00:00
|
|
|
)
|
|
|
|
|
<*> switch
|
|
|
|
|
( long "fakessh"
|
|
|
|
|
<> internal
|
|
|
|
|
)
|
|
|
|
|
<*> cmdParams "non-options are for internal use only"
|
2015-07-13 17:19:20 +00:00
|
|
|
|
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)
|
|
|
|
|
|
2018-11-19 16:39:16 +00:00
|
|
|
runner :: TestOptions -> IO ()
|
|
|
|
|
runner opts
|
|
|
|
|
| fakeSsh opts = runFakeSsh (internalData opts)
|
|
|
|
|
| otherwise = runsubprocesstests =<< Utility.Env.getEnv subenv
|
2017-03-17 23:13:52 +00:00
|
|
|
where
|
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"
|
2018-11-19 16:39:16 +00:00
|
|
|
runsubprocesstests Nothing = do
|
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
|
2017-08-14 20:27:35 +00:00
|
|
|
pp <- Annex.Path.programPath
|
2017-12-31 20:08:31 +00:00
|
|
|
Utility.Env.Set.setEnv subenv "1" True
|
2017-08-14 20:27:35 +00:00
|
|
|
ps <- getArgs
|
2020-06-03 19:48:09 +00:00
|
|
|
exitcode <- withCreateProcess (proc pp ps) $
|
|
|
|
|
\_ _ _ pid -> waitForProcess pid
|
2017-08-14 20:27:35 +00:00
|
|
|
unless (keepFailuresOption opts) finalCleanup
|
|
|
|
|
exitWith exitcode
|
2018-11-19 16:39:16 +00:00
|
|
|
runsubprocesstests (Just _) = isolateGitConfig $ do
|
2017-03-17 23:13:52 +00:00
|
|
|
ensuretmpdir
|
2017-09-29 18:58:23 +00:00
|
|
|
crippledfilesystem <- fst <$> Annex.Init.probeCrippledFileSystem' tmpdir
|
2019-08-15 17:54:05 +00:00
|
|
|
adjustedbranchok <- Annex.AdjustedBranch.isGitVersionSupported
|
|
|
|
|
case tryIngredients ingredients (tastyOptionSet opts) (tests crippledfilesystem adjustedbranchok opts) of
|
2017-03-17 23:13:52 +00:00
|
|
|
Nothing -> error "No tests found!?"
|
|
|
|
|
Just act -> ifM act
|
|
|
|
|
( exitSuccess
|
|
|
|
|
, do
|
2017-08-14 20:27:35 +00:00
|
|
|
putStrLn " (Failures above could be due to a bug in git-annex, or an incompatibility"
|
2017-03-17 23:13:52 +00:00
|
|
|
putStrLn " with utilities, such as git, installed on this system.)"
|
|
|
|
|
exitFailure
|
|
|
|
|
)
|
2014-01-21 04:08:43 +00:00
|
|
|
|
|
|
|
|
ingredients :: [Ingredient]
|
|
|
|
|
ingredients =
|
2015-03-31 18:47:27 +00:00
|
|
|
[ listingTests
|
|
|
|
|
, rerunningTests [consoleTestReporter]
|
2014-01-21 04:08:43 +00:00
|
|
|
]
|
2013-08-06 04:12:06 +00:00
|
|
|
|
2019-08-15 17:54:05 +00:00
|
|
|
tests :: Bool -> Bool -> TestOptions -> TestTree
|
|
|
|
|
tests crippledfilesystem adjustedbranchok opts =
|
2020-04-30 16:59:20 +00:00
|
|
|
testGroup "Tests" $ properties
|
2020-04-30 17:49:22 +00:00
|
|
|
: withTestMode remotetestmode Nothing testRemotes
|
2020-04-30 16:59:20 +00:00
|
|
|
: map (\(d, te) -> withTestMode te (Just initTests) (unitTests d)) testmodes
|
2015-12-15 21:19:26 +00:00
|
|
|
where
|
2016-02-16 19:30:59 +00:00
|
|
|
testmodes = catMaybes
|
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))
|
2015-12-28 16:57:42 +00:00
|
|
|
]
|
2020-04-30 16:59:20 +00:00
|
|
|
remotetestmode = testMode opts (RepoVersion 8)
|
2016-02-16 20:02:54 +00:00
|
|
|
unlesscrippled v
|
|
|
|
|
| crippledfilesystem = Nothing
|
|
|
|
|
| otherwise = Just v
|
2019-08-15 17:54:05 +00:00
|
|
|
canadjust v
|
|
|
|
|
| adjustedbranchok = Just v
|
|
|
|
|
| otherwise = Nothing
|
2015-07-08 04:03:28 +00:00
|
|
|
|
2013-08-06 04:12:06 +00:00
|
|
|
properties :: TestTree
|
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
|
2017-02-24 17:42:30 +00:00
|
|
|
, testProperty "prop_isomorphic_key_encode" Key.prop_isomorphic_key_encode
|
2015-11-16 18:37:31 +00:00
|
|
|
, testProperty "prop_isomorphic_shellEscape" Utility.SafeCommand.prop_isomorphic_shellEscape
|
|
|
|
|
, testProperty "prop_isomorphic_shellEscape_multiword" Utility.SafeCommand.prop_isomorphic_shellEscape_multiword
|
|
|
|
|
, testProperty "prop_isomorphic_configEscape" Logs.Remote.prop_isomorphic_configEscape
|
2013-08-06 04:12:06 +00:00
|
|
|
, testProperty "prop_parse_show_Config" Logs.Remote.prop_parse_show_Config
|
2015-01-09 18:26:52 +00:00
|
|
|
, testProperty "prop_upFrom_basics" Utility.Path.prop_upFrom_basics
|
2013-08-06 04:12:06 +00:00
|
|
|
, testProperty "prop_relPathDirToFile_basics" Utility.Path.prop_relPathDirToFile_basics
|
|
|
|
|
, testProperty "prop_relPathDirToFile_regressionTest" Utility.Path.prop_relPathDirToFile_regressionTest
|
|
|
|
|
, 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
|
2017-08-14 17:55:38 +00:00
|
|
|
, testProperty "prop_VectorClock_sane" Annex.VectorClock.prop_VectorClock_sane
|
2014-03-15 17:44:31 +00:00
|
|
|
, testProperty "prop_addMapLog_sane" Logs.MapLog.prop_addMapLog_sane
|
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
|
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
|
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
|
2015-11-17 19:49:22 +00:00
|
|
|
, testProperty "prop_schedule_roundtrips" Utility.Scheduled.QuickCheck.prop_schedule_roundtrips
|
2014-04-12 18:19:56 +00:00
|
|
|
, testProperty "prop_past_sane" Utility.Scheduled.prop_past_sane
|
2013-11-14 21:03:49 +00:00
|
|
|
, testProperty "prop_duration_roundtrips" Utility.HumanTime.prop_duration_roundtrips
|
2014-02-13 02:27:55 +00:00
|
|
|
, testProperty "prop_metadata_sane" Types.MetaData.prop_metadata_sane
|
2014-02-12 21:54:28 +00:00
|
|
|
, testProperty "prop_metadata_serialize" Types.MetaData.prop_metadata_serialize
|
2014-02-18 21:38:23 +00:00
|
|
|
, testProperty "prop_branchView_legal" Logs.View.prop_branchView_legal
|
2016-01-08 16:45:32 +00:00
|
|
|
, testProperty "prop_viewPath_roundtrips" Annex.View.prop_viewPath_roundtrips
|
2014-02-17 01:00:12 +00:00
|
|
|
, testProperty "prop_view_roundtrips" Annex.View.prop_view_roundtrips
|
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
|
2015-06-17 17:44:19 +00:00
|
|
|
, testProperty "prop_standardGroups_parse" Logs.PreferredContent.prop_standardGroups_parse
|
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
|
|
|
|
|
]
|
2010-11-02 21:08:16 +00:00
|
|
|
|
2020-04-30 17:49:22 +00:00
|
|
|
testRemotes :: TestTree
|
|
|
|
|
testRemotes = testGroup "Remote Tests"
|
|
|
|
|
[ testRemote "directory"
|
|
|
|
|
[ "directory=remotedir"
|
|
|
|
|
, "encryption=none"
|
2020-04-29 19:48:09 +00:00
|
|
|
]
|
2020-04-30 17:49:22 +00:00
|
|
|
(createDirectory "remotedir")
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
testRemote :: String -> [String] -> IO () -> TestTree
|
|
|
|
|
testRemote remotetype config preinitremote =
|
|
|
|
|
withResource newEmptyTMVarIO (const noop) $ \getv ->
|
|
|
|
|
testGroup ("remote type " ++ remotetype) $ concat
|
|
|
|
|
[ [testCase "init" (prep getv)]
|
|
|
|
|
, go getv
|
|
|
|
|
]
|
2020-04-29 19:48:09 +00:00
|
|
|
where
|
|
|
|
|
reponame = "test repo"
|
2020-04-30 17:49:22 +00:00
|
|
|
remotename = "testremote"
|
2020-04-29 19:48:09 +00:00
|
|
|
basesz = 1024 * 1024
|
2020-04-30 16:59:20 +00:00
|
|
|
keysizes = Command.TestRemote.keySizes basesz False
|
2020-04-29 19:48:09 +00:00
|
|
|
prep getv = do
|
|
|
|
|
d <- newmainrepodir
|
|
|
|
|
setmainrepodir d
|
|
|
|
|
innewrepo $ do
|
|
|
|
|
git_annex "init" [reponame, "--quiet"]
|
|
|
|
|
@? "init failed"
|
2020-04-30 17:49:22 +00:00
|
|
|
preinitremote
|
2020-04-29 19:48:09 +00:00
|
|
|
git_annex "initremote"
|
2020-04-30 17:49:22 +00:00
|
|
|
([ remotename
|
2020-04-30 17:13:08 +00:00
|
|
|
, "type=" ++ remotetype
|
2020-04-29 19:48:09 +00:00
|
|
|
, "--quiet"
|
2020-04-30 17:49:22 +00:00
|
|
|
] ++ config)
|
2020-04-29 19:48:09 +00:00
|
|
|
@? "init failed"
|
|
|
|
|
r <- annexeval $ either error return
|
2020-04-30 17:49:22 +00:00
|
|
|
=<< Remote.byName' remotename
|
2020-06-22 18:25:49 +00:00
|
|
|
cache <- Command.TestRemote.newRemoteVariantCache
|
2020-04-30 16:59:20 +00:00
|
|
|
unavailr <- annexeval $ Types.Remote.mkUnavailable r
|
2020-06-22 18:25:49 +00:00
|
|
|
exportr <- annexeval $ Command.TestRemote.exportTreeVariant cache r
|
2020-04-30 16:59:20 +00:00
|
|
|
ks <- annexeval $ mapM Command.TestRemote.randKey keysizes
|
2020-04-29 19:48:09 +00:00
|
|
|
v <- getv
|
2020-06-22 18:25:49 +00:00
|
|
|
cv <- annexeval cache
|
2020-04-29 19:48:09 +00:00
|
|
|
liftIO $ atomically $ putTMVar v
|
2020-06-22 18:25:49 +00:00
|
|
|
(r, (unavailr, (exportr, (ks, cv))))
|
2020-04-30 16:59:20 +00:00
|
|
|
go getv = Command.TestRemote.mkTestTrees runannex mkrs mkunavailr mkexportr mkks
|
2020-04-29 19:48:09 +00:00
|
|
|
where
|
|
|
|
|
runannex = inmainrepo . annexeval
|
2020-06-22 18:25:49 +00:00
|
|
|
mkrs = Command.TestRemote.remoteVariants cache mkr basesz False
|
2020-04-30 17:49:22 +00:00
|
|
|
mkr = descas (remotetype ++ " remote") (fst <$> v)
|
2020-04-30 16:59:20 +00:00
|
|
|
mkunavailr = fst . snd <$> v
|
2020-04-30 17:13:08 +00:00
|
|
|
mkexportr = fst . snd . snd <$> v
|
2020-04-30 16:59:20 +00:00
|
|
|
mkks = map (\(sz, n) -> desckeysize sz (getk n))
|
|
|
|
|
(zip keysizes [0..])
|
2020-06-22 18:25:49 +00:00
|
|
|
getk n = fmap (!! n) (fst . snd . snd . snd <$> v)
|
|
|
|
|
cache = snd . snd . snd . snd <$> v
|
2020-04-30 16:59:20 +00:00
|
|
|
v = liftIO $ atomically . readTMVar =<< getv
|
|
|
|
|
descas = Command.TestRemote.Described
|
|
|
|
|
desckeysize sz = descas ("key size " ++ show sz)
|
2020-04-29 19:48:09 +00:00
|
|
|
|
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. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
initTests :: TestTree
|
|
|
|
|
initTests = testGroup "Init Tests"
|
|
|
|
|
[ testCase "init" test_init
|
|
|
|
|
, testCase "add" test_add
|
2014-01-21 18:24:30 +00:00
|
|
|
]
|
2014-12-30 20:58:02 +00:00
|
|
|
|
|
|
|
|
unitTests :: String -> TestTree
|
|
|
|
|
unitTests note = testGroup ("Unit Tests " ++ note)
|
2016-01-01 17:59:57 +00:00
|
|
|
[ testCase "add dup" test_add_dup
|
2014-12-30 20:58:02 +00:00
|
|
|
, testCase "add extras" test_add_extras
|
2019-03-06 20:49:33 +00:00
|
|
|
, testCase "export_import" test_export_import
|
2019-05-06 18:24:42 +00:00
|
|
|
, testCase "export_import_subdir" test_export_import_subdir
|
2015-09-09 17:56:37 +00:00
|
|
|
, testCase "shared clone" test_shared_clone
|
2015-07-02 16:53:38 +00:00
|
|
|
, testCase "log" test_log
|
2015-06-03 18:39:47 +00:00
|
|
|
, testCase "import" test_import
|
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
|
2017-03-17 23:18:45 +00:00
|
|
|
, testCase "get (ssh remote)" test_get_ssh_remote
|
2014-12-30 20:58:02 +00:00
|
|
|
, testCase "move" test_move
|
2017-03-17 23:18:45 +00:00
|
|
|
, testCase "move (ssh remote)" test_move_ssh_remote
|
2014-12-30 20:58:02 +00:00
|
|
|
, testCase "copy" test_copy
|
|
|
|
|
, testCase "lock" test_lock
|
2019-08-30 17:54:57 +00:00
|
|
|
, testCase "lock --force" test_lock_force
|
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
|
2015-04-18 17:36:12 +00:00
|
|
|
, testCase "fsck --from remote" test_fsck_fromremote
|
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
|
2019-11-14 18:02:09 +00:00
|
|
|
, testCase "concurrent get of dup key regression" test_concurrent_get_of_dup_key_regression
|
2014-12-30 20:58:02 +00:00
|
|
|
, testCase "union merge regression" test_union_merge_regression
|
2016-06-13 16:56:31 +00:00
|
|
|
, testCase "adjusted branch merge regression" test_adjusted_branch_merge_regression
|
2016-10-11 18:22:49 +00:00
|
|
|
, testCase "adjusted branch subtree regression" test_adjusted_branch_subtree_regression
|
2014-12-30 20:58:02 +00:00
|
|
|
, testCase "conflict resolution" test_conflict_resolution
|
2016-04-12 17:01:31 +00:00
|
|
|
, testCase "conflict resolution (adjusted branch)" test_conflict_resolution_adjusted_branch
|
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
|
2015-12-30 20:36:39 +00:00
|
|
|
, testCase "conflict resolution (mixed locked and unlocked file)" test_mixed_lock_conflict_resolution
|
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
|
2015-02-10 19:20:07 +00:00
|
|
|
, testCase "addurl" test_addurl
|
2011-01-07 00:09:49 +00:00
|
|
|
]
|
|
|
|
|
|
2020-04-29 19:48:09 +00:00
|
|
|
-- this test case creates the main repo
|
2014-12-30 20:58:02 +00:00
|
|
|
test_init :: Assertion
|
|
|
|
|
test_init = innewrepo $ do
|
2015-12-16 17:14:18 +00:00
|
|
|
ver <- annexVersion <$> getTestMode
|
2018-12-19 17:07:19 +00:00
|
|
|
git_annex "init" [reponame, "--version", show (fromRepoVersion ver)] @? "init failed"
|
2015-12-15 21:19:26 +00:00
|
|
|
setupTestMode
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
reponame = "test repo"
|
2011-01-07 00:09:49 +00:00
|
|
|
|
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
|
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
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex annexedfile @? "add failed"
|
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
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [sha1annexedfile, "--backend=SHA1"] @? "add with SHA1 failed"
|
2016-01-01 17:59:57 +00:00
|
|
|
whenM (unlockedFiles <$> getTestMode) $
|
|
|
|
|
git_annex "unlock" [sha1annexedfile] @? "unlock failed"
|
2013-08-06 04:12:06 +00:00
|
|
|
annexed_present sha1annexedfile
|
|
|
|
|
checkbackend sha1annexedfile backendSHA1
|
2019-08-26 19:07:10 +00:00
|
|
|
writecontent ingitfile $ content ingitfile
|
|
|
|
|
boolSystem "git" [Param "add", File ingitfile] @? "git add failed"
|
|
|
|
|
boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "commit"] @? "git commit failed"
|
|
|
|
|
git_annex "add" [ingitfile] @? "add ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
2013-08-06 04:12:06 +00:00
|
|
|
|
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
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex annexedfiledup @? "add of second file with same content failed"
|
|
|
|
|
annexed_present annexedfiledup
|
|
|
|
|
annexed_present annexedfile
|
2013-08-06 04:12:06 +00:00
|
|
|
|
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
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [wormannexedfile, "--backend=WORM"] @? "add with WORM failed"
|
2016-01-01 17:59:57 +00:00
|
|
|
whenM (unlockedFiles <$> getTestMode) $
|
|
|
|
|
git_annex "unlock" [wormannexedfile] @? "unlock failed"
|
2014-01-21 18:24:30 +00:00
|
|
|
annexed_present wormannexedfile
|
|
|
|
|
checkbackend wormannexedfile backendWORM
|
|
|
|
|
|
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"
|
|
|
|
|
|
2015-07-02 16:53:38 +00:00
|
|
|
test_log :: Assertion
|
|
|
|
|
test_log = intmpclonerepo $ do
|
|
|
|
|
git_annex "log" [annexedfile] @? "log failed"
|
|
|
|
|
|
2015-06-03 18:39:47 +00:00
|
|
|
test_import :: Assertion
|
2017-12-31 20:08:31 +00:00
|
|
|
test_import = intmpclonerepo $ Utility.Tmp.Dir.withTmpDir "importtest" $ \importdir -> do
|
2015-06-03 18:39:47 +00:00
|
|
|
(toimport1, importf1, imported1) <- mktoimport importdir "import1"
|
|
|
|
|
git_annex "import" [toimport1] @? "import failed"
|
2016-02-16 19:30:59 +00:00
|
|
|
annexed_present_imported imported1
|
2015-06-03 18:39:47 +00:00
|
|
|
checkdoesnotexist importf1
|
|
|
|
|
|
|
|
|
|
(toimport2, importf2, imported2) <- mktoimport importdir "import2"
|
|
|
|
|
git_annex "import" [toimport2] @? "import of duplicate failed"
|
2016-02-16 19:30:59 +00:00
|
|
|
annexed_present_imported imported2
|
2015-06-03 18:39:47 +00:00
|
|
|
checkdoesnotexist importf2
|
|
|
|
|
|
|
|
|
|
(toimport3, importf3, imported3) <- mktoimport importdir "import3"
|
|
|
|
|
git_annex "import" ["--skip-duplicates", toimport3]
|
|
|
|
|
@? "import of duplicate with --skip-duplicates failed"
|
|
|
|
|
checkdoesnotexist imported3
|
|
|
|
|
checkexists importf3
|
|
|
|
|
git_annex "import" ["--clean-duplicates", toimport3]
|
|
|
|
|
@? "import of duplicate with --clean-duplicates failed"
|
|
|
|
|
checkdoesnotexist imported3
|
|
|
|
|
checkdoesnotexist importf3
|
|
|
|
|
|
|
|
|
|
(toimport4, importf4, imported4) <- mktoimport importdir "import4"
|
|
|
|
|
git_annex "import" ["--deduplicate", toimport4] @? "import --deduplicate failed"
|
|
|
|
|
checkdoesnotexist imported4
|
|
|
|
|
checkdoesnotexist importf4
|
|
|
|
|
|
|
|
|
|
(toimport5, importf5, imported5) <- mktoimport importdir "import5"
|
|
|
|
|
git_annex "import" ["--duplicate", toimport5] @? "import --duplicate failed"
|
2016-02-16 19:30:59 +00:00
|
|
|
annexed_present_imported imported5
|
2015-06-03 18:39:47 +00:00
|
|
|
checkexists importf5
|
|
|
|
|
|
|
|
|
|
git_annex "drop" ["--force", imported1, imported2, imported5] @? "drop failed"
|
2016-02-16 19:30:59 +00:00
|
|
|
annexed_notpresent_imported imported2
|
2015-06-03 18:39:47 +00:00
|
|
|
(toimportdup, importfdup, importeddup) <- mktoimport importdir "importdup"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "import" ["--clean-duplicates", toimportdup]
|
2017-02-07 21:35:51 +00:00
|
|
|
@? "import of missing duplicate with --clean-duplicates failed to fail"
|
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)
|
2015-06-03 18:39:47 +00:00
|
|
|
return (importdir </> subdir, importdir </> importf, importf)
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_reinject :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_reinject = intmpclonerepo $ do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" ["--force", sha1annexedfile] @? "drop failed"
|
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
|
2019-01-14 17:03:35 +00:00
|
|
|
key <- Key.serializeKey <$> getKey backendSHA1 tmp
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed"
|
2016-01-05 21:19:30 +00:00
|
|
|
annexed_present sha1annexedfile
|
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
|
|
|
|
|
git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed for dup"
|
|
|
|
|
annexed_present_locked sha1annexedfiledup
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
tmp = "tmpfile"
|
2011-01-11 23:59:11 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_unannex_nocopy :: Assertion
|
|
|
|
|
test_unannex_nocopy = intmpclonerepo $ do
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unannex" [annexedfile] @? "unannex failed with no copy"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_notpresent annexedfile
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_unannex_withcopy :: Assertion
|
|
|
|
|
test_unannex_withcopy = intmpclonerepo $ do
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unannex" [annexedfile, sha1annexedfile] @? "unannex failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
unannexed annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unannex" [annexedfile] @? "unannex failed on non-annexed file"
|
2013-11-14 21:03:49 +00:00
|
|
|
unannexed annexedfile
|
2019-08-26 19:07:10 +00:00
|
|
|
git_annex "unannex" [ingitfile] @? "unannex ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
2011-01-07 01:39:26 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_drop_noremote :: Assertion
|
|
|
|
|
test_drop_noremote = intmpclonerepo $ do
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "rm", Param "origin"]
|
2013-11-14 21:03:49 +00:00
|
|
|
@? "git remote rm origin failed"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile] @? "drop wrongly succeeded with no known copy of file"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" ["--force", annexedfile] @? "drop --force failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile] @? "drop of dropped file failed"
|
2019-08-26 19:07:10 +00:00
|
|
|
git_annex "drop" [ingitfile] @? "drop ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_drop_withremote :: Assertion
|
|
|
|
|
test_drop_withremote = intmpclonerepo $ do
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "numcopies" ["2"] @? "numcopies config failed"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile] @? "drop succeeded although numcopies is not satisfied"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "numcopies" ["1"] @? "numcopies config failed"
|
|
|
|
|
git_annex "drop" [annexedfile] @? "drop failed though origin has copy"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_notpresent annexedfile
|
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" [] []
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_drop_untrustedremote :: Assertion
|
|
|
|
|
test_drop_untrustedremote = intmpclonerepo $ do
|
|
|
|
|
git_annex "untrust" ["origin"] @? "untrust of origin failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile] @? "drop wrongly succeeded with only an untrusted copy of the file"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_get :: Assertion
|
2017-03-17 23:13:52 +00:00
|
|
|
test_get = test_get' intmpclonerepo
|
|
|
|
|
|
|
|
|
|
test_get_ssh_remote :: Assertion
|
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
|
2017-03-17 23:13:52 +00:00
|
|
|
|
|
|
|
|
test_get' :: (Assertion -> Assertion) -> Assertion
|
|
|
|
|
test_get' setup = setup $ do
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
|
|
|
|
inmainrepo $ annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file already here failed"
|
|
|
|
|
inmainrepo $ annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2019-08-26 19:07:10 +00:00
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
unannexed ingitfile
|
|
|
|
|
git_annex "get" [ingitfile] @? "get ingitfile should be no-op"
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
unannexed ingitfile
|
2011-01-07 05:02:06 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_move :: Assertion
|
2017-03-17 23:18:45 +00:00
|
|
|
test_move = test_move' intmpclonerepo
|
|
|
|
|
|
|
|
|
|
test_move_ssh_remote :: Assertion
|
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
|
2017-03-17 23:18:45 +00:00
|
|
|
|
|
|
|
|
test_move' :: (Assertion -> Assertion) -> Assertion
|
|
|
|
|
test_move' setup = setup $ do
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
|
|
|
|
git_annex "move" ["--from", "origin", annexedfile] @? "move --from of file failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_notpresent annexedfile
|
|
|
|
|
git_annex "move" ["--from", "origin", annexedfile] @? "move --from of file already here failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_notpresent annexedfile
|
|
|
|
|
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file failed"
|
|
|
|
|
inmainrepo $ annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file already there failed"
|
|
|
|
|
inmainrepo $ annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2019-08-26 19:07:10 +00:00
|
|
|
unannexed ingitfile
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
git_annex "move" ["--to", "origin", ingitfile] @? "move of ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
git_annex "move" ["--from", "origin", ingitfile] @? "move of ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_copy :: Assertion
|
|
|
|
|
test_copy = intmpclonerepo $ do
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
|
|
|
|
git_annex "copy" ["--from", "origin", annexedfile] @? "copy --from of file failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
|
|
|
|
git_annex "copy" ["--from", "origin", annexedfile] @? "copy --from of file already here failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
|
|
|
|
git_annex "copy" ["--to", "origin", annexedfile] @? "copy --to of file already there failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
|
|
|
|
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file already there failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
inmainrepo $ annexed_present annexedfile
|
2019-08-26 19:07:10 +00:00
|
|
|
unannexed ingitfile
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
git_annex "copy" ["--to", "origin", ingitfile] @? "copy of ingitfile should be no-op"
|
|
|
|
|
unannexed ingitfile
|
|
|
|
|
inmainrepo $ unannexed ingitfile
|
|
|
|
|
git_annex "copy" ["--from", "origin", ingitfile] @? "copy of ingitfile should be no-op"
|
|
|
|
|
checkregularfile ingitfile
|
|
|
|
|
checkcontent ingitfile
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_preferred_content :: Assertion
|
|
|
|
|
test_preferred_content = intmpclonerepo $ do
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2015-10-06 21:35:29 +00:00
|
|
|
-- get/copy --auto looks only at numcopies when preferred content is not
|
2013-05-25 17:51:36 +00:00
|
|
|
-- set, and with 1 copy existing, does not get the file.
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with default preferred content"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2015-10-06 21:35:29 +00:00
|
|
|
git_annex "copy" ["--from", "origin", "--auto", annexedfile] @? "copy --auto --from of file failed with default preferred content"
|
|
|
|
|
annexed_notpresent annexedfile
|
2013-05-25 17:51:36 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "wanted" [".", "standard"] @? "set expression to standard failed"
|
|
|
|
|
git_annex "group" [".", "client"] @? "set group to standard failed"
|
|
|
|
|
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed for client"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_present annexedfile
|
2015-10-06 21:35:29 +00:00
|
|
|
git_annex "drop" [annexedfile] @? "drop of file failed"
|
|
|
|
|
git_annex "copy" ["--from", "origin", "--auto", annexedfile] @? "copy --auto --from of file failed for client"
|
|
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "ungroup" [".", "client"] @? "ungroup failed"
|
2013-05-25 17:51:36 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "wanted" [".", "standard"] @? "set expression to standard failed"
|
|
|
|
|
git_annex "group" [".", "manual"] @? "set group to manual failed"
|
2013-05-25 17:51:36 +00:00
|
|
|
-- drop --auto with manual leaves the file where it is
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" ["--auto", annexedfile] @? "drop --auto of file failed with manual preferred content"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile] @? "drop of file failed"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2015-10-06 21:35:29 +00:00
|
|
|
-- copy/get --auto with manual does not get the file
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with manual preferred content"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2015-10-06 21:35:29 +00:00
|
|
|
git_annex "copy" ["--from", "origin", "--auto", annexedfile] @? "copy --auto --from of file failed with manual preferred content"
|
|
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "ungroup" [".", "client"] @? "ungroup failed"
|
2013-05-25 17:51:36 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "wanted" [".", "exclude=*"] @? "set expression to exclude=* failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" ["--auto", annexedfile] @? "drop --auto of file failed with exclude=*"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with exclude=*"
|
2013-05-25 17:51:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_lock :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_lock = intmpclonerepo $ do
|
2011-01-14 03:46:02 +00:00
|
|
|
annexed_notpresent annexedfile
|
|
|
|
|
|
2015-01-02 17:59:25 +00:00
|
|
|
-- regression test: unlock of newly added, not committed file
|
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"
|
2015-01-02 17:59:25 +00:00
|
|
|
git_annex "add" ["newfile"] @? "add new file failed"
|
2019-08-30 17:54:57 +00:00
|
|
|
git_annex "unlock" ["newfile"] @? "unlock failed on newly added, never committed file"
|
2015-01-02 17:59:25 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unlock" [annexedfile] @? "unlock failed"
|
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"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "lock" [annexedfile] @? "lock failed to fail without --force"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "lock" ["--force", annexedfile] @? "lock --force failed"
|
2019-08-30 17:54:57 +00:00
|
|
|
-- The original content of an unlocked file is not always
|
2015-12-16 20:56:27 +00:00
|
|
|
-- preserved after modification, so re-get it.
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed after lock --force"
|
2016-01-06 20:12:00 +00:00
|
|
|
annexed_present_locked annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unlock" [annexedfile] @? "unlock failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
unannexed annexedfile
|
|
|
|
|
changecontent annexedfile
|
2019-08-30 17:54:57 +00:00
|
|
|
boolSystem "git" [Param "add", Param annexedfile] @? "add of modified file failed"
|
|
|
|
|
runchecks [checkregularfile, checkwritable] annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
c <- readFile annexedfile
|
2011-07-15 07:12:05 +00:00
|
|
|
assertEqual "content of modified file" c (changedcontent annexedfile)
|
2014-12-30 20:58:02 +00:00
|
|
|
r' <- git_annex "drop" [annexedfile]
|
2011-01-14 03:46:02 +00:00
|
|
|
not r' @? "drop wrongly succeeded with no known copy of modified file"
|
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.)
|
2019-08-30 17:54:57 +00:00
|
|
|
test_lock_force :: Assertion
|
|
|
|
|
test_lock_force = intmpclonerepo $ do
|
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
|
|
|
git_annex "upgrade" [] @? "upgrade failed"
|
2019-08-30 17:54:57 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
|
|
|
|
git_annex "unlock" [annexedfile] @? "unlock failed"
|
|
|
|
|
annexeval $ do
|
2020-07-10 18:17:35 +00:00
|
|
|
Just k <- Annex.WorkTree.lookupKey (toRawFilePath annexedfile)
|
2019-08-30 17:54:57 +00:00
|
|
|
Database.Keys.removeInodeCaches k
|
|
|
|
|
Database.Keys.closeDb
|
|
|
|
|
liftIO . nukeFile =<< Annex.fromRepo Annex.Locations.gitAnnexKeysDbIndexCache
|
|
|
|
|
writecontent annexedfile "test_lock_force content"
|
|
|
|
|
git_annex_shouldfail "lock" [annexedfile] @? "lock of modified file failed to fail"
|
|
|
|
|
git_annex "lock" ["--force", annexedfile] @? "lock --force of modified file failed"
|
|
|
|
|
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
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_edit :: Assertion
|
2013-11-14 21:03:49 +00:00
|
|
|
test_edit = test_edit' False
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_edit_precommit :: Assertion
|
2013-11-14 21:03:49 +00:00
|
|
|
test_edit_precommit = test_edit' True
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_edit' :: Bool -> Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_edit' precommit = intmpclonerepo $ do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2012-11-11 04:51:07 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "edit" [annexedfile] @? "edit failed"
|
2012-11-11 04:51:07 +00:00
|
|
|
unannexed annexedfile
|
|
|
|
|
changecontent annexedfile
|
2013-05-16 02:10:49 +00:00
|
|
|
boolSystem "git" [Param "add", File annexedfile]
|
|
|
|
|
@? "git add of edited file failed"
|
2012-11-11 04:51:07 +00:00
|
|
|
if precommit
|
2014-12-30 20:58:02 +00:00
|
|
|
then git_annex "pre-commit" []
|
2013-05-16 02:10:49 +00:00
|
|
|
@? "pre-commit failed"
|
2015-06-01 17:52:23 +00:00
|
|
|
else boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "contentchanged"]
|
2013-05-16 02:10:49 +00:00
|
|
|
@? "git commit of edited file failed"
|
2019-08-30 17:54:57 +00:00
|
|
|
runchecks [checkregularfile, checkwritable] annexedfile
|
2012-11-11 04:51:07 +00:00
|
|
|
c <- readFile annexedfile
|
|
|
|
|
assertEqual "content of modified file" c (changedcontent annexedfile)
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile] @? "drop wrongly succeeded with no known copy of modified file"
|
2011-01-07 18:06:32 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_partial_commit :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_partial_commit = intmpclonerepo $ do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2014-11-10 19:36:24 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unlock" [annexedfile] @? "unlock failed"
|
2016-01-06 20:14:51 +00:00
|
|
|
changecontent annexedfile
|
2019-08-30 17:54:57 +00:00
|
|
|
boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "test", File annexedfile]
|
|
|
|
|
@? "partial commit of unlocked file should be allowed"
|
2014-11-10 19:36:24 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_fix :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_fix = intmpclonerepo $ unlessM (hasUnlockedFiles <$> getTestMode) $ do
|
2011-01-07 18:08:43 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "fix" [annexedfile] @? "fix of not present failed"
|
2011-01-07 18:08:43 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "fix" [annexedfile] @? "fix of present file failed"
|
2011-01-07 18:08:43 +00:00
|
|
|
annexed_present annexedfile
|
2011-01-07 18:06:32 +00:00
|
|
|
createDirectory subdir
|
2011-08-22 20:14:12 +00:00
|
|
|
boolSystem "git" [Param "mv", File annexedfile, File subdir]
|
2011-01-07 18:06:32 +00:00
|
|
|
@? "git mv failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "fix" [newfile] @? "fix of moved file failed"
|
2011-01-07 18:06:32 +00:00
|
|
|
runchecks [checklink, checkunwritable] newfile
|
|
|
|
|
c <- readFile newfile
|
2011-07-15 07:12:05 +00:00
|
|
|
assertEqual "content of moved file" c (content annexedfile)
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
subdir = "s"
|
|
|
|
|
newfile = subdir ++ "/" ++ annexedfile
|
2011-01-07 01:39:26 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_trust :: Assertion
|
|
|
|
|
test_trust = intmpclonerepo $ do
|
|
|
|
|
git_annex "trust" [repo] @? "trust failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.Trusted "trusted 1"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "trust" [repo] @? "trust of trusted failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.Trusted "trusted 2"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "untrust" [repo] @? "untrust failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.UnTrusted "untrusted 1"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "untrust" [repo] @? "untrust of untrusted failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.UnTrusted "untrusted 2"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "dead" [repo] @? "dead failed"
|
2011-12-20 20:26:39 +00:00
|
|
|
trustcheck Logs.Trust.DeadTrusted "deadtrusted 1"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "dead" [repo] @? "dead of dead failed"
|
2011-12-20 20:26:39 +00:00
|
|
|
trustcheck Logs.Trust.DeadTrusted "deadtrusted 2"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "semitrust" [repo] @? "semitrust failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.SemiTrusted "semitrusted 1"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "semitrust" [repo] @? "semitrust of semitrusted failed"
|
2011-10-15 20:21:08 +00:00
|
|
|
trustcheck Logs.Trust.SemiTrusted "semitrusted 2"
|
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
|
2011-01-11 22:50:18 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_fsck_basic :: Assertion
|
|
|
|
|
test_fsck_basic = intmpclonerepo $ do
|
|
|
|
|
git_annex "fsck" [] @? "fsck failed"
|
|
|
|
|
git_annex "numcopies" ["2"] @? "numcopies config failed"
|
|
|
|
|
fsck_should_fail "numcopies unsatisfied"
|
|
|
|
|
git_annex "numcopies" ["1"] @? "numcopies config failed"
|
2013-11-15 00:09:47 +00:00
|
|
|
corrupt annexedfile
|
|
|
|
|
corrupt sha1annexedfile
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
corrupt f = do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [f] @? "get of file failed"
|
2012-11-11 04:51:07 +00:00
|
|
|
Utility.FileMode.allowWrite 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)
|
2019-08-26 19:07:10 +00:00
|
|
|
ifM (hasUnlockedFiles <$> getTestMode)
|
2016-01-06 20:30:49 +00:00
|
|
|
( git_annex "fsck" [] @? "fsck failed on unlocked file with changed file content"
|
2018-10-30 14:49:39 +00:00
|
|
|
, git_annex_shouldfail "fsck" [] @? "fsck failed to fail with corrupted file content"
|
2013-05-17 19:20:21 +00:00
|
|
|
)
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "fsck" [] @? "fsck unexpectedly failed again; previous one did not fix problem with " ++ f
|
|
|
|
|
|
|
|
|
|
test_fsck_bare :: Assertion
|
|
|
|
|
test_fsck_bare = intmpbareclonerepo $
|
|
|
|
|
git_annex "fsck" [] @? "fsck failed"
|
|
|
|
|
|
|
|
|
|
test_fsck_localuntrusted :: Assertion
|
|
|
|
|
test_fsck_localuntrusted = intmpclonerepo $ do
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
|
|
|
|
git_annex "untrust" ["origin"] @? "untrust of origin repo failed"
|
|
|
|
|
git_annex "untrust" ["."] @? "untrust of current repo failed"
|
|
|
|
|
fsck_should_fail "content only available in untrusted (current) repository"
|
|
|
|
|
git_annex "trust" ["."] @? "trust of current repo failed"
|
|
|
|
|
git_annex "fsck" [annexedfile] @? "fsck failed on file present in trusted repo"
|
|
|
|
|
|
|
|
|
|
test_fsck_remoteuntrusted :: Assertion
|
|
|
|
|
test_fsck_remoteuntrusted = intmpclonerepo $ do
|
|
|
|
|
git_annex "numcopies" ["2"] @? "numcopies config failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
|
|
|
|
git_annex "get" [sha1annexedfile] @? "get failed"
|
|
|
|
|
git_annex "fsck" [] @? "fsck failed with numcopies=2 and 2 copies"
|
|
|
|
|
git_annex "untrust" ["origin"] @? "untrust of origin failed"
|
|
|
|
|
fsck_should_fail "content not replicated to enough non-untrusted repositories"
|
|
|
|
|
|
2015-04-18 17:36:12 +00:00
|
|
|
test_fsck_fromremote :: Assertion
|
|
|
|
|
test_fsck_fromremote = intmpclonerepo $ do
|
|
|
|
|
git_annex "fsck" ["--from", "origin"] @? "fsck --from origin failed"
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
fsck_should_fail :: String -> Assertion
|
2018-10-30 14:49:39 +00:00
|
|
|
fsck_should_fail m = git_annex_shouldfail "fsck" []
|
2013-11-14 21:03:49 +00:00
|
|
|
@? "fsck failed to fail with " ++ m
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_migrate :: Assertion
|
2013-11-14 21:03:49 +00:00
|
|
|
test_migrate = test_migrate' False
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_migrate_via_gitattributes :: Assertion
|
2013-11-14 21:03:49 +00:00
|
|
|
test_migrate_via_gitattributes = test_migrate' True
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_migrate' :: Bool -> Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_migrate' usegitattributes = intmpclonerepo $ do
|
2012-11-11 04:51:07 +00:00
|
|
|
annexed_notpresent annexedfile
|
|
|
|
|
annexed_notpresent sha1annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [annexedfile] @? "migrate of not present failed"
|
|
|
|
|
git_annex "migrate" [sha1annexedfile] @? "migrate of not present failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
|
|
|
|
git_annex "get" [sha1annexedfile] @? "get of file failed"
|
2012-11-11 04:51:07 +00:00
|
|
|
annexed_present annexedfile
|
|
|
|
|
annexed_present sha1annexedfile
|
|
|
|
|
if usegitattributes
|
|
|
|
|
then do
|
2014-02-11 05:35:11 +00:00
|
|
|
writeFile ".gitattributes" "* annex.backend=SHA1"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [sha1annexedfile]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate sha1annexedfile failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [annexedfile]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate annexedfile failed"
|
|
|
|
|
else do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [sha1annexedfile, "--backend", "SHA1"]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate sha1annexedfile failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [annexedfile, "--backend", "SHA1"]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate annexedfile failed"
|
|
|
|
|
annexed_present annexedfile
|
|
|
|
|
annexed_present sha1annexedfile
|
|
|
|
|
checkbackend annexedfile backendSHA1
|
|
|
|
|
checkbackend sha1annexedfile backendSHA1
|
|
|
|
|
|
|
|
|
|
-- check that reversing a migration works
|
2014-02-11 05:35:11 +00:00
|
|
|
writeFile ".gitattributes" "* annex.backend=SHA256"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [sha1annexedfile]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate sha1annexedfile failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "migrate" [annexedfile]
|
2012-11-11 04:51:07 +00:00
|
|
|
@? "migrate annexedfile failed"
|
|
|
|
|
annexed_present annexedfile
|
|
|
|
|
annexed_present sha1annexedfile
|
|
|
|
|
checkbackend annexedfile backendSHA256
|
|
|
|
|
checkbackend sha1annexedfile backendSHA256
|
2011-01-12 01:11:32 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_unused :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_unused = intmpclonerepo $ do
|
2015-12-30 17:29:00 +00:00
|
|
|
checkunused [] "in new clone"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
|
|
|
|
git_annex "get" [sha1annexedfile] @? "get of file failed"
|
2016-01-07 02:11:21 +00:00
|
|
|
annexedfilekey <- getKey backendSHA256E annexedfile
|
|
|
|
|
sha1annexedfilekey <- getKey backendSHA1 sha1annexedfile
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [] "after get"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "rm", Param "-fq", File annexedfile] @? "git rm failed"
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [] "after rm"
|
2019-08-09 15:06:54 +00:00
|
|
|
-- commit the rm, and when on an adjusted branch, sync it back to
|
|
|
|
|
-- the master branch
|
|
|
|
|
git_annex "sync" ["--no-push", "--no-pull"] @? "git-annex sync failed"
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [] "after commit"
|
2011-09-28 21:48:11 +00:00
|
|
|
-- unused checks origin/master; once it's gone it is really unused
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "git remote rm origin failed"
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [annexedfilekey] "after origin branches are gone"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "rm", Param "-fq", File sha1annexedfile] @? "git rm failed"
|
2019-08-09 15:06:54 +00:00
|
|
|
git_annex "sync" ["--no-push", "--no-pull"] @? "git-annex sync failed"
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [annexedfilekey, sha1annexedfilekey] "after rm sha1annexedfile"
|
2011-01-12 05:58:23 +00:00
|
|
|
|
|
|
|
|
-- good opportunity to test dropkey also
|
2019-01-14 17:03:35 +00:00
|
|
|
git_annex "dropkey" ["--force", Key.serializeKey annexedfilekey]
|
2011-01-12 05:58:23 +00:00
|
|
|
@? "dropkey failed"
|
2019-01-14 17:03:35 +00:00
|
|
|
checkunused [sha1annexedfilekey] ("after dropkey --force " ++ Key.serializeKey annexedfilekey)
|
2011-01-12 05:58:23 +00:00
|
|
|
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "dropunused" ["1"] @? "dropunused failed to fail without --force"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "dropunused" ["--force", "1"] @? "dropunused failed"
|
2012-09-21 04:49:48 +00:00
|
|
|
checkunused [] "after dropunused"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "dropunused" ["--force", "10", "501"] @? "dropunused failed to fail on bogus numbers"
|
2011-01-12 05:58:23 +00:00
|
|
|
|
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.
|
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"
|
2016-02-16 20:02:54 +00:00
|
|
|
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
|
|
|
|
|
unusedfilekey <- getKey backendSHA256E "unusedfile"
|
|
|
|
|
renameFile "unusedfile" "unusedunstagedfile"
|
|
|
|
|
boolSystem "git" [Param "rm", Param "-qf", File "unusedfile"] @? "git rm failed"
|
|
|
|
|
checkunused [] "with unstaged link"
|
|
|
|
|
removeFile "unusedunstagedfile"
|
|
|
|
|
checkunused [unusedfilekey] "with renamed link deleted"
|
2013-11-14 21:03:49 +00:00
|
|
|
|
|
|
|
|
-- unused used to miss symlinks that were deleted or modified
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
boolSystem "git" [Param "add", File "unusedfile"] @? "git add failed"
|
2016-01-07 02:11:21 +00:00
|
|
|
unusedfilekey' <- getKey backendSHA256E "unusedfile"
|
2013-11-14 21:03:49 +00:00
|
|
|
checkunused [] "with staged deleted link"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "rm", Param "-qf", File "unusedfile"] @? "git rm failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
checkunused [unusedfilekey'] "with staged link deleted"
|
|
|
|
|
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
boolSystem "git" [Param "add", File "unusedfile"] @? "git add failed"
|
2016-01-06 20:30:49 +00:00
|
|
|
checkunused [] "with staged file"
|
2013-11-14 21:03:49 +00:00
|
|
|
removeFile "unusedfile"
|
2016-01-06 20:30:49 +00:00
|
|
|
checkunused [] "with staged deleted file"
|
2013-11-14 21:03:49 +00:00
|
|
|
|
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.
|
2019-08-09 15:06:54 +00:00
|
|
|
whenM (hasUnlockedFiles <$> getTestMode) $ do
|
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"
|
2016-01-07 02:11:21 +00:00
|
|
|
boolSystem "git" [Param "add", File "unlockedfile"] @? "git add failed"
|
|
|
|
|
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"
|
2016-01-07 02:11:21 +00:00
|
|
|
checkunused [] "with unlocked file after modification"
|
|
|
|
|
not <$> boolSystem "git" [Param "diff", Param "--quiet", File f] @? "git diff did not show changes to unlocked file"
|
|
|
|
|
-- 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"
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
checkunused expectedkeys desc = do
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "unused" [] @? "unused failed"
|
2014-01-22 19:33:02 +00:00
|
|
|
unusedmap <- annexeval $ Logs.Unused.readUnusedMap ""
|
2012-11-11 04:51:07 +00:00
|
|
|
let unusedkeys = M.elems unusedmap
|
|
|
|
|
assertEqual ("unused keys differ " ++ desc)
|
|
|
|
|
(sort expectedkeys) (sort unusedkeys)
|
2011-01-12 05:58:23 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_describe :: Assertion
|
|
|
|
|
test_describe = intmpclonerepo $ do
|
|
|
|
|
git_annex "describe" [".", "this repo"] @? "describe 1 failed"
|
|
|
|
|
git_annex "describe" ["origin", "origin repo"] @? "describe 2 failed"
|
2011-12-20 20:26:39 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_find :: Assertion
|
|
|
|
|
test_find = intmpclonerepo $ do
|
2011-12-20 20:26:39 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex_expectoutput "find" [] []
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2011-12-21 06:32:40 +00:00
|
|
|
annexed_present annexedfile
|
|
|
|
|
annexed_notpresent sha1annexedfile
|
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"] []
|
2011-12-20 20:26:39 +00:00
|
|
|
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" ["dir"] @? "add of subdir failed"
|
|
|
|
|
git_annex_expectoutput "find" ["--include", "*", "--exclude", annexedfile, "--exclude", sha1annexedfile] ["dir/subfile"]
|
|
|
|
|
git_annex_expectoutput "find" ["--exclude", "*"] []
|
2013-02-26 17:49:22 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_merge :: Assertion
|
|
|
|
|
test_merge = intmpclonerepo $
|
|
|
|
|
git_annex "merge" [] @? "merge failed"
|
2011-12-20 20:26:39 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_info :: Assertion
|
|
|
|
|
test_info = intmpclonerepo $ do
|
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
|
2016-07-26 23:15:34 +00:00
|
|
|
Right _ -> return ()
|
|
|
|
|
Left e -> assertFailure e
|
2011-12-20 20:26:39 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_version :: Assertion
|
|
|
|
|
test_version = intmpclonerepo $
|
|
|
|
|
git_annex "version" [] @? "version failed"
|
2011-12-20 21:31:25 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_sync :: Assertion
|
|
|
|
|
test_sync = intmpclonerepo $ do
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
2016-01-26 21:33:16 +00:00
|
|
|
{- Regression test for bug fixed in
|
|
|
|
|
- 039e83ed5d1a11fd562cce55b8429c840d72443e, where a present
|
|
|
|
|
- wanted file was dropped. -}
|
|
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
|
|
|
|
git_annex_expectoutput "find" ["--in", "."] [annexedfile]
|
|
|
|
|
git_annex "wanted" [".", "present"] @? "wanted failed"
|
|
|
|
|
git_annex "sync" ["--content"] @? "sync failed"
|
|
|
|
|
git_annex_expectoutput "find" ["--in", "."] [annexedfile]
|
|
|
|
|
git_annex "drop" [annexedfile] @? "drop failed"
|
|
|
|
|
git_annex_expectoutput "find" ["--in", "."] []
|
|
|
|
|
git_annex "sync" ["--content"] @? "sync failed"
|
|
|
|
|
git_annex_expectoutput "find" ["--in", "."] []
|
2011-12-20 20:26:39 +00:00
|
|
|
|
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]
|
|
|
|
|
@? "concurrent get -J1 with dup failed"
|
|
|
|
|
git_annex "drop" ["-J1"]
|
|
|
|
|
@? "drop with dup failed"
|
|
|
|
|
-- With -J2, one more dup file was needed to trigger the bug.
|
|
|
|
|
makedup dupfile2
|
|
|
|
|
git_annex "get" ["-J2", annexedfile, dupfile, dupfile2]
|
|
|
|
|
@? "concurrent get -J2 with dup failed"
|
|
|
|
|
git_annex "drop" ["-J2"]
|
|
|
|
|
@? "drop with dup failed"
|
|
|
|
|
where
|
|
|
|
|
dupfile = annexedfile ++ "2"
|
|
|
|
|
dupfile2 = annexedfile ++ "3"
|
|
|
|
|
makedup f = do
|
|
|
|
|
Utility.CopyFile.copyFileExternal Utility.CopyFile.CopyAllMetaData annexedfile f
|
|
|
|
|
@? "copying annexed file failed"
|
|
|
|
|
boolSystem "git" [Param "add", File f]
|
|
|
|
|
@? "git add failed"
|
|
|
|
|
|
2013-05-20 19:51:40 +00:00
|
|
|
{- Regression test for union merge bug fixed in
|
2013-01-17 20:02:58 +00:00
|
|
|
- 0214e0fb175a608a49b812d81b4632c081f63027 -}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_union_merge_regression :: Assertion
|
|
|
|
|
test_union_merge_regression =
|
2013-01-17 20:02:58 +00:00
|
|
|
{- We need 3 repos to see this bug. -}
|
2015-09-09 17:56:37 +00:00
|
|
|
withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 ->
|
|
|
|
|
withtmpclonerepo $ \r3 -> do
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r1, r2, r3] $ \r -> indir r $ do
|
2013-01-17 20:02:58 +00:00
|
|
|
when (r /= r1) $
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "add", Param "r1", File ("../../" ++ r1)] @? "remote add"
|
2013-01-17 20:02:58 +00:00
|
|
|
when (r /= r2) $
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "add", Param "r2", File ("../../" ++ r2)] @? "remote add"
|
2013-01-17 20:02:58 +00:00
|
|
|
when (r /= r3) $
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "add", Param "r3", File ("../../" ++ r3)] @? "remote add"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "remote rm"
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r3, r2, r1] $ \r -> indir r $
|
2016-06-03 16:51:27 +00:00
|
|
|
git_annex "sync" [] @? ("sync failed in " ++ r)
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r3, r2] $ \r -> indir r $
|
2016-06-03 16:51:27 +00:00
|
|
|
git_annex "drop" ["--force", annexedfile] @? ("drop failed in " ++ r)
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
git_annex_expectoutput "find" ["--in", "r3"] []
|
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 -}
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex_expectoutput "find" ["--in", "r2"] []
|
2013-01-17 20:02:58 +00:00
|
|
|
|
2013-05-20 19:51:40 +00:00
|
|
|
{- Regression test for the automatic conflict resolution bug fixed
|
|
|
|
|
- in f4ba19f2b8a76a1676da7bb5850baa40d9c388e2. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_conflict_resolution_movein_regression :: Assertion
|
2015-09-09 17:56:37 +00:00
|
|
|
test_conflict_resolution_movein_regression = withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
2013-11-14 21:03:49 +00:00
|
|
|
let rname r = if r == r1 then "r1" else "r2"
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r1, r2] $ \r -> indir r $ do
|
2013-11-14 21:03:49 +00:00
|
|
|
{- Get all files, see check below. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [] @? "get failed"
|
2014-02-03 16:03:10 +00:00
|
|
|
disconnectOrigin
|
2014-12-30 20:58:02 +00:00
|
|
|
pair r1 r2
|
|
|
|
|
forM_ [r1, r2] $ \r -> indir r $ do
|
2013-11-14 21:03:49 +00:00
|
|
|
{- Set up a conflict. -}
|
|
|
|
|
let newcontent = content annexedfile ++ rname r
|
2019-08-26 19:07:10 +00:00
|
|
|
git_annex "unlock" [annexedfile] @? "unlock failed"
|
|
|
|
|
writecontent annexedfile newcontent
|
2013-11-14 21:03:49 +00:00
|
|
|
{- Sync twice in r1 so it gets the conflict resolution
|
|
|
|
|
- update from r2 -}
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r1, r2, r1] $ \r -> indir r $
|
|
|
|
|
git_annex "sync" ["--force"] @? "sync failed in " ++ rname r
|
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.
|
|
|
|
|
-
|
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. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ [r1, r2] $ \r -> indir r $ do
|
|
|
|
|
git_annex "get" [] @? "unable to get all files after merge conflict resolution in " ++ rname r
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-03-05 03:12:15 +00:00
|
|
|
{- Simple case of conflict resolution; 2 different versions of annexed
|
|
|
|
|
- file. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_conflict_resolution :: Assertion
|
|
|
|
|
test_conflict_resolution =
|
2015-09-09 17:56:37 +00:00
|
|
|
withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $ do
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
pair r1 r2
|
|
|
|
|
forM_ [r1,r2,r1] $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
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)
|
2014-07-11 20:56:19 +00:00
|
|
|
conflictor `notElem` l @? ("conflictor still present after conflict resolution")
|
2014-12-30 20:58:02 +00:00
|
|
|
indir d $ do
|
|
|
|
|
git_annex "get" v @? "get failed"
|
|
|
|
|
git_annex_expectoutput "find" v v
|
2014-03-05 03:12:15 +00:00
|
|
|
|
2016-04-12 17:01:31 +00:00
|
|
|
{- Conflict resolution while in an adjusted branch. -}
|
|
|
|
|
test_conflict_resolution_adjusted_branch :: Assertion
|
2018-11-05 17:27:16 +00:00
|
|
|
test_conflict_resolution_adjusted_branch =
|
2016-04-12 17:01:31 +00:00
|
|
|
withtmpclonerepo $ \r1 ->
|
2018-11-05 17:27:16 +00:00
|
|
|
withtmpclonerepo $ \r2 -> whenM (adjustedbranchsupported r2) $ do
|
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"
|
2016-04-12 17:01:31 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
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"
|
2016-04-12 17:01:31 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
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.
|
|
|
|
|
git_annex "adjust" ["--unlock", "--force"] @? "adjust failed"
|
2016-04-12 17:01:31 +00:00
|
|
|
pair r1 r2
|
|
|
|
|
forM_ [r1,r2,r1] $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
|
|
|
|
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
|
|
|
|
|
git_annex "get" v @? "get failed"
|
|
|
|
|
git_annex_expectoutput "find" v v
|
2014-03-05 03:12:15 +00:00
|
|
|
|
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. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_mixed_conflict_resolution :: Assertion
|
|
|
|
|
test_mixed_conflict_resolution = do
|
2014-03-04 21:12:26 +00:00
|
|
|
check True
|
|
|
|
|
check False
|
2013-11-14 21:03:49 +00:00
|
|
|
where
|
2015-09-09 17:56:37 +00:00
|
|
|
check inr1 = withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $ do
|
2014-02-03 16:03:10 +00:00
|
|
|
disconnectOrigin
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
pair r1 r2
|
2014-02-03 18:32:07 +00:00
|
|
|
let l = if inr1 then [r1, r2] else [r2, r1]
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ l $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed in mixed conflict"
|
2014-02-03 18:32:07 +00:00
|
|
|
checkmerge "r1" r1
|
2014-03-04 21:12:26 +00:00
|
|
|
checkmerge "r2" r2
|
2014-02-04 19:14:16 +00:00
|
|
|
conflictor = "conflictor"
|
2014-03-04 17:23:47 +00:00
|
|
|
subfile = conflictor </> "subfile"
|
2014-02-04 19:14:16 +00:00
|
|
|
variantprefix = conflictor ++ ".variant"
|
|
|
|
|
checkmerge what d = do
|
|
|
|
|
doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing")
|
|
|
|
|
l <- getDirectoryContents d
|
2014-03-04 17:23:47 +00:00
|
|
|
let v = filter (variantprefix `isPrefixOf`) l
|
|
|
|
|
not (null v)
|
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)
|
2014-12-30 20:58:02 +00:00
|
|
|
indir d $ do
|
|
|
|
|
git_annex "get" (conflictor:v) @? ("get failed in " ++ what)
|
2019-12-05 18:36:43 +00:00
|
|
|
git_annex_expectoutput "find" [conflictor] [fromRawFilePath (Git.FilePath.toInternalGitPath (toRawFilePath subfile))]
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex_expectoutput "find" v v
|
2014-02-04 19:14:16 +00:00
|
|
|
|
2014-03-04 21:37:36 +00:00
|
|
|
{- Check merge conflict resolution when both repos start with an annexed
|
2014-03-04 21:12:26 +00:00
|
|
|
- file; one modifies it, and the other deletes it. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_remove_conflict_resolution :: Assertion
|
|
|
|
|
test_remove_conflict_resolution = do
|
2014-03-04 21:12:26 +00:00
|
|
|
check True
|
|
|
|
|
check False
|
|
|
|
|
where
|
2015-09-09 17:56:37 +00:00
|
|
|
check inr1 = withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $
|
2014-03-04 21:12:26 +00:00
|
|
|
disconnectOrigin
|
2014-12-30 20:58:02 +00:00
|
|
|
pair r1 r2
|
|
|
|
|
indir r2 $ do
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
git_annex "get" [conflictor]
|
2014-03-04 21:12:26 +00:00
|
|
|
@? "get conflictor failed"
|
2019-08-26 19:07:10 +00:00
|
|
|
git_annex "unlock" [conflictor]
|
|
|
|
|
@? "unlock conflictor failed"
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $
|
2014-03-04 21:12:26 +00:00
|
|
|
nukeFile conflictor
|
|
|
|
|
let l = if inr1 then [r1, r2, r1] else [r2, r1, r2]
|
2014-12-30 20:58:02 +00:00
|
|
|
forM_ l $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
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)
|
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)
|
2014-03-04 21:12:26 +00:00
|
|
|
|
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.
|
|
|
|
|
-}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_nonannexed_file_conflict_resolution :: Assertion
|
|
|
|
|
test_nonannexed_file_conflict_resolution = do
|
2019-08-26 19:07:10 +00:00
|
|
|
check True
|
|
|
|
|
check False
|
2014-03-04 21:37:36 +00:00
|
|
|
where
|
2019-08-26 19:07:10 +00:00
|
|
|
check inr1 = withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
|
|
|
|
indir r1 $ do
|
|
|
|
|
disconnectOrigin
|
|
|
|
|
writecontent conflictor "conflictor"
|
|
|
|
|
add_annex conflictor @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $ do
|
|
|
|
|
disconnectOrigin
|
|
|
|
|
writecontent conflictor nonannexed_content
|
|
|
|
|
boolSystem "git"
|
|
|
|
|
[ Param "config"
|
|
|
|
|
, Param "annex.largefiles"
|
|
|
|
|
, Param ("exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor)
|
|
|
|
|
] @? "git config annex.largefiles failed"
|
|
|
|
|
boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
pair r1 r2
|
|
|
|
|
let l = if inr1 then [r1, r2] else [r2, r1]
|
|
|
|
|
forM_ l $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
|
|
|
|
checkmerge "r1" r1
|
|
|
|
|
checkmerge "r2" r2
|
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 )
|
2014-03-05 03:12:15 +00:00
|
|
|
length v == 1
|
|
|
|
|
@? (what ++ " too many variant files in: " ++ show v)
|
2014-03-04 21:37:36 +00:00
|
|
|
conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
|
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)
|
2014-03-04 21:37:36 +00:00
|
|
|
|
2014-07-10 17:34:53 +00:00
|
|
|
|
2019-08-26 19:07:10 +00:00
|
|
|
{- Check merge conflict resolution when a file is annexed in one repo,
|
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.
|
|
|
|
|
-}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_nonannexed_symlink_conflict_resolution :: Assertion
|
|
|
|
|
test_nonannexed_symlink_conflict_resolution = do
|
2019-08-26 19:07:10 +00:00
|
|
|
check True
|
|
|
|
|
check False
|
2014-07-10 17:34:53 +00:00
|
|
|
where
|
2019-08-26 19:07:10 +00:00
|
|
|
check inr1 = withtmpclonerepo $ \r1 ->
|
2015-09-09 17:56:37 +00:00
|
|
|
withtmpclonerepo $ \r2 ->
|
2019-08-26 19:07:10 +00:00
|
|
|
whenM (checkRepo (Types.coreSymlinks <$> Annex.getGitConfig) r1) $ do
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
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"
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add conflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $ do
|
2014-07-10 17:34:53 +00:00
|
|
|
disconnectOrigin
|
|
|
|
|
createSymbolicLink symlinktarget "conflictor"
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
pair r1 r2
|
2014-07-10 17:34:53 +00:00
|
|
|
let l = if inr1 then [r1, r2] else [r2, r1]
|
2019-08-26 19:07:10 +00:00
|
|
|
forM_ l $ \r -> indir r $
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed"
|
2019-08-26 19:07:10 +00:00
|
|
|
checkmerge "r1" r1
|
|
|
|
|
checkmerge "r2" r2
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
-}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_uncommitted_conflict_resolution :: Assertion
|
|
|
|
|
test_uncommitted_conflict_resolution = do
|
2014-03-04 05:41:00 +00:00
|
|
|
check conflictor
|
|
|
|
|
check (conflictor </> "file")
|
|
|
|
|
where
|
2015-09-09 17:56:37 +00:00
|
|
|
check remoteconflictor = withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 -> do
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r1 $ do
|
2014-03-04 05:41:00 +00:00
|
|
|
disconnectOrigin
|
2015-01-09 17:11:56 +00:00
|
|
|
createDirectoryIfMissing True (parentDir 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
|
2016-01-01 17:59:57 +00:00
|
|
|
add_annex conflictor @? "add remoteconflicter failed"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
|
|
|
|
indir r2 $ do
|
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
|
2014-12-30 20:58:02 +00:00
|
|
|
pair r1 r2
|
2019-08-26 19:07:10 +00:00
|
|
|
-- this case is intentionally not handled
|
|
|
|
|
-- since the user can recover on their own easily
|
|
|
|
|
indir r2 $ git_annex_shouldfail "sync" []
|
|
|
|
|
@? "sync failed to fail"
|
2014-03-04 05:41:00 +00:00
|
|
|
conflictor = "conflictor"
|
|
|
|
|
localcontent = "local"
|
|
|
|
|
annexedcontent = "annexed"
|
|
|
|
|
|
2014-03-04 18:31:26 +00:00
|
|
|
{- On Windows/FAT, repeated conflict resolution sometimes
|
|
|
|
|
- lost track of whether a file was a symlink.
|
2014-02-04 19:31:53 +00:00
|
|
|
-}
|
2014-12-30 20:58:02 +00:00
|
|
|
test_conflict_resolution_symlink_bit :: Assertion
|
2019-08-09 15:06:54 +00:00
|
|
|
test_conflict_resolution_symlink_bit = unlessM (hasUnlockedFiles <$> getTestMode) $
|
2015-09-09 17:56:37 +00:00
|
|
|
withtmpclonerepo $ \r1 ->
|
|
|
|
|
withtmpclonerepo $ \r2 ->
|
|
|
|
|
withtmpclonerepo $ \r3 -> do
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
2014-03-04 18:31:26 +00:00
|
|
|
check_is_link conflictor "r1"
|
2014-12-30 20:58:02 +00:00
|
|
|
indir r2 $ do
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
2014-03-04 18:31:26 +00:00
|
|
|
check_is_link (conflictor </> "subfile") "r2"
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
2014-03-04 18:31:26 +00:00
|
|
|
check_is_link (conflictor </> "subfile") "r3"
|
|
|
|
|
where
|
2014-02-04 19:14:16 +00:00
|
|
|
conflictor = "conflictor"
|
2014-03-04 18:31:26 +00:00
|
|
|
check_is_link f what = do
|
2019-12-05 18:36:43 +00:00
|
|
|
git_annex_expectoutput "find" ["--include=*", f] [fromRawFilePath (Git.FilePath.toInternalGitPath (toRawFilePath f))]
|
2014-03-04 18:31:26 +00:00
|
|
|
l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles Git.Ref.headRef [f]
|
2018-05-14 18:22:44 +00:00
|
|
|
all (\i -> Git.Types.toTreeItemType (Git.LsTree.mode i) == Just Git.Types.TreeSymlink) l
|
2014-03-04 18:31:26 +00:00
|
|
|
@? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l)
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2019-08-30 17:54:57 +00:00
|
|
|
{- An unlocked file that conflicts with a locked file should be resolved
|
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
|
2019-08-30 17:54:57 +00:00
|
|
|
indir r1 $ do
|
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"
|
2015-12-30 20:36:39 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r1"
|
2019-08-30 17:54:57 +00:00
|
|
|
indir r2 $ do
|
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"
|
2015-12-30 20:36:39 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "unlock" [conflictor] @? "unlock conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed in r2"
|
|
|
|
|
pair r1 r2
|
|
|
|
|
forM_ [r1,r2,r1] $ \r -> indir r $
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
|
|
|
|
checkmerge "r1" r1
|
|
|
|
|
checkmerge "r2" r2
|
|
|
|
|
where
|
|
|
|
|
conflictor = "conflictor"
|
|
|
|
|
variantprefix = conflictor ++ ".variant"
|
2019-08-30 17:54:57 +00:00
|
|
|
checkmerge what d = indir d $ do
|
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")
|
|
|
|
|
git_annex "get" [conflictor] @? "get failed"
|
|
|
|
|
git_annex_expectoutput "find" [conflictor] [conflictor]
|
|
|
|
|
-- regular file because it's unlocked
|
|
|
|
|
checkregularfile conflictor
|
|
|
|
|
|
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
|
2018-11-05 17:27:16 +00:00
|
|
|
test_adjusted_branch_merge_regression = do
|
2016-06-13 16:56:31 +00:00
|
|
|
withtmpclonerepo $ \r1 ->
|
2018-11-05 17:27:16 +00:00
|
|
|
withtmpclonerepo $ \r2 -> whenM (adjustedbranchsupported r1) $ do
|
2016-06-13 16:56:31 +00:00
|
|
|
pair r1 r2
|
|
|
|
|
setup r1
|
|
|
|
|
setup r2
|
|
|
|
|
checkmerge "r1" r1
|
|
|
|
|
checkmerge "r2" r2
|
|
|
|
|
where
|
|
|
|
|
conflictor = "conflictor"
|
2018-12-19 17:36:14 +00:00
|
|
|
setup r = indir r $ whensupported $ do
|
2016-06-13 16:56:31 +00:00
|
|
|
disconnectOrigin
|
|
|
|
|
git_annex "upgrade" [] @? "upgrade failed"
|
|
|
|
|
git_annex "adjust" ["--unlock", "--force"] @? "adjust failed"
|
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"
|
2016-06-13 16:56:31 +00:00
|
|
|
git_annex "add" [conflictor] @? "add conflicter failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
2018-12-19 17:36:14 +00:00
|
|
|
checkmerge what d = indir d $ whensupported $ do
|
2016-06-13 16:56:31 +00:00
|
|
|
git_annex "sync" [] @? ("sync failed in " ++ what)
|
|
|
|
|
l <- getDirectoryContents "."
|
|
|
|
|
conflictor `elem` l
|
|
|
|
|
@? ("conflictor not present after merge in " ++ what)
|
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)
|
2016-06-13 16:56:31 +00:00
|
|
|
|
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 =
|
2018-11-05 17:27:16 +00:00
|
|
|
withtmpclonerepo $ \r -> whenM (adjustedbranchsupported r) $ do
|
|
|
|
|
indir r $ do
|
|
|
|
|
disconnectOrigin
|
2020-06-23 21:41:50 +00:00
|
|
|
origbranch <- annexeval origBranch
|
2018-11-05 17:27:16 +00:00
|
|
|
git_annex "upgrade" [] @? "upgrade failed"
|
|
|
|
|
git_annex "adjust" ["--unlock", "--force"] @? "adjust failed"
|
|
|
|
|
createDirectoryIfMissing True "a/b/c"
|
|
|
|
|
writecontent "a/b/c/d" "foo"
|
|
|
|
|
git_annex "add" ["a/b/c"] @? "add a/b/c failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
|
|
|
|
createDirectoryIfMissing True "a/b/x"
|
|
|
|
|
writecontent "a/b/x/y" "foo"
|
|
|
|
|
git_annex "add" ["a/b/x"] @? "add a/b/x failed"
|
|
|
|
|
git_annex "sync" [] @? "sync failed"
|
2020-06-23 20:40:41 +00:00
|
|
|
boolSystem "git" [Param "checkout", Param origbranch] @? "git checkout failed"
|
2018-11-05 17:27:16 +00:00
|
|
|
doesFileExist "a/b/x/y" @? ("a/b/x/y missing from master after adjusted branch sync")
|
2016-10-11 18:22:49 +00:00
|
|
|
|
2014-02-03 16:03:10 +00:00
|
|
|
{- Set up repos as remotes of each other. -}
|
2014-12-30 20:58:02 +00:00
|
|
|
pair :: FilePath -> FilePath -> Assertion
|
|
|
|
|
pair r1 r2 = forM_ [r1, r2] $ \r -> indir r $ do
|
2013-11-14 21:03:49 +00:00
|
|
|
when (r /= r1) $
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "add", Param "r1", File ("../../" ++ r1)] @? "remote add"
|
2013-11-14 21:03:49 +00:00
|
|
|
when (r /= r2) $
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "remote", Param "add", Param "r2", File ("../../" ++ r2)] @? "remote add"
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_map :: Assertion
|
|
|
|
|
test_map = intmpclonerepo $ do
|
2011-12-20 20:31:59 +00:00
|
|
|
-- set descriptions, that will be looked for in the map
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "describe" [".", "this repo"] @? "describe 1 failed"
|
|
|
|
|
git_annex "describe" ["origin", "origin repo"] @? "describe 2 failed"
|
2011-12-20 20:31:59 +00:00
|
|
|
-- --fast avoids it running graphviz, not a build dependency
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "map" ["--fast"] @? "map failed"
|
2011-12-20 21:31:25 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_uninit :: Assertion
|
|
|
|
|
test_uninit = intmpclonerepo $ do
|
|
|
|
|
git_annex "get" [] @? "get failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
_ <- git_annex "uninit" [] -- exit status not checked; does abnormal exit
|
2013-11-14 21:03:49 +00:00
|
|
|
checkregularfile annexedfile
|
|
|
|
|
doesDirectoryExist ".git" @? ".git vanished in uninit"
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_uninit_inbranch :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_uninit_inbranch = intmpclonerepo $ do
|
2015-06-01 17:52:23 +00:00
|
|
|
boolSystem "git" [Param "checkout", Param "git-annex"] @? "git checkout git-annex"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "uninit" [] @? "uninit failed to fail when git-annex branch was checked out"
|
2013-11-14 21:03:49 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_upgrade :: Assertion
|
|
|
|
|
test_upgrade = intmpclonerepo $
|
2016-04-12 17:01:31 +00:00
|
|
|
git_annex "upgrade" [] @? "upgrade failed"
|
2011-12-20 21:31:25 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_whereis :: Assertion
|
|
|
|
|
test_whereis = intmpclonerepo $ do
|
2011-12-20 21:31:25 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "whereis" [annexedfile] @? "whereis on non-present file failed"
|
|
|
|
|
git_annex "untrust" ["origin"] @? "untrust failed"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "whereis" [annexedfile] @? "whereis on non-present file only present in untrusted repo failed to fail"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get failed"
|
2011-12-20 21:31:25 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "whereis" [annexedfile] @? "whereis on present file failed"
|
2011-12-20 20:31:59 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_hook_remote :: Assertion
|
|
|
|
|
test_hook_remote = intmpclonerepo $ do
|
2013-08-04 17:07:55 +00:00
|
|
|
#ifndef mingw32_HOST_OS
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "initremote" (words "foo type=hook encryption=none hooktype=foo") @? "initremote failed"
|
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"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-12-20 19:13:36 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to hook remote failed"
|
2011-12-20 19:13:36 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
|
2011-12-20 19:13:36 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from hook remote failed"
|
2011-12-20 19:13:36 +00:00
|
|
|
annexed_present annexedfile
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
|
dir = "dir"
|
|
|
|
|
loc = dir ++ "/$ANNEX_KEY"
|
|
|
|
|
git_config k v = boolSystem "git" [Param "config", Param k, Param v]
|
|
|
|
|
@? "git config failed"
|
2013-06-18 20:12:43 +00:00
|
|
|
#else
|
|
|
|
|
-- this test doesn't work in Windows TODO
|
|
|
|
|
noop
|
|
|
|
|
#endif
|
2011-12-20 19:13:36 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_directory_remote :: Assertion
|
|
|
|
|
test_directory_remote = intmpclonerepo $ do
|
2011-12-20 19:17:56 +00:00
|
|
|
createDirectory "dir"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "initremote" (words "foo type=directory encryption=none directory=dir") @? "initremote failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to directory remote failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from directory remote failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
|
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_rsync_remote :: Assertion
|
|
|
|
|
test_rsync_remote = intmpclonerepo $ do
|
2019-08-08 16:37:25 +00:00
|
|
|
#ifndef mingw32_HOST_OS
|
2011-12-20 19:17:56 +00:00
|
|
|
createDirectory "dir"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "initremote" (words "foo type=rsync encryption=none rsyncurl=dir") @? "initremote failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to rsync remote failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from rsync remote failed"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
|
2011-12-20 19:17:56 +00:00
|
|
|
annexed_present annexedfile
|
2019-08-08 17:41:56 +00:00
|
|
|
#else
|
|
|
|
|
noop
|
2019-08-08 16:37:25 +00:00
|
|
|
#endif
|
2011-12-20 19:17:56 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_bup_remote :: Assertion
|
2017-12-14 16:46:57 +00:00
|
|
|
test_bup_remote = intmpclonerepo $ when BuildInfo.bup $ do
|
2011-12-21 17:50:33 +00:00
|
|
|
dir <- absPath "dir" -- bup special remote needs an absolute path
|
|
|
|
|
createDirectory dir
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "initremote" (words $ "foo type=bup encryption=none buprepo="++dir) @? "initremote failed"
|
|
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2011-12-21 17:50:33 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to bup remote failed"
|
2011-12-21 17:50:33 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
|
2011-12-21 17:50:33 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--from", "foo"] @? "copy --from bup remote failed"
|
2011-12-21 17:50:33 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from bup remote failed"
|
2011-12-21 17:50:33 +00:00
|
|
|
annexed_present annexedfile
|
|
|
|
|
|
2011-12-21 18:10:36 +00:00
|
|
|
-- gpg is not a build dependency, so only test when it's available
|
2014-12-30 20:58:02 +00:00
|
|
|
test_crypto :: Assertion
|
2013-08-04 17:07:55 +00:00
|
|
|
#ifndef mingw32_HOST_OS
|
2014-12-30 20:58:02 +00:00
|
|
|
test_crypto = do
|
2013-11-14 21:03:49 +00:00
|
|
|
testscheme "shared"
|
|
|
|
|
testscheme "hybrid"
|
|
|
|
|
testscheme "pubkey"
|
|
|
|
|
where
|
2015-09-09 22:06:49 +00:00
|
|
|
gpgcmd = Utility.Gpg.mkGpgCmd Nothing
|
2019-01-21 18:00:21 +00:00
|
|
|
testscheme scheme = do
|
2020-03-26 17:04:24 +00:00
|
|
|
abstmp <- absPath tmpdir
|
|
|
|
|
testscheme' scheme abstmp
|
2020-04-28 19:47:23 +00:00
|
|
|
testscheme' scheme abstmp = intmpclonerepo $ do
|
2020-03-26 17:04:24 +00:00
|
|
|
gpgtmp <- (</> "gpgtmp") <$> relPathCwdToFile abstmp
|
2019-01-21 18:00:21 +00:00
|
|
|
createDirectoryIfMissing False gpgtmp
|
2020-04-28 19:47:23 +00:00
|
|
|
Utility.Gpg.testTestHarness gpgtmp gpgcmd
|
2015-09-09 22:06:49 +00:00
|
|
|
@? "test harness self-test failed"
|
2020-04-28 19:47:23 +00:00
|
|
|
void $ Utility.Gpg.testHarness gpgtmp gpgcmd $ do
|
2013-11-14 21:03:49 +00:00
|
|
|
createDirectory "dir"
|
2014-12-30 20:58:02 +00:00
|
|
|
let a cmd = git_annex cmd $
|
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 []
|
|
|
|
|
a "initremote" @? "initremote failed"
|
|
|
|
|
not <$> a "initremote" @? "initremote failed to fail when run twice in a row"
|
|
|
|
|
a "enableremote" @? "enableremote failed"
|
|
|
|
|
a "enableremote" @? "enableremote failed when run twice in a row"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "get" [annexedfile] @? "get of file failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to encrypted remote failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
(c,k) <- annexeval $ do
|
|
|
|
|
uuid <- Remote.nameToUUID "foo"
|
|
|
|
|
rs <- Logs.Remote.readRemoteLog
|
2020-07-10 18:17:35 +00:00
|
|
|
Just k <- Annex.WorkTree.lookupKey (toRawFilePath annexedfile)
|
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
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_notpresent annexedfile
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from encrypted remote failed"
|
2013-11-14 21:03:49 +00:00
|
|
|
annexed_present annexedfile
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
|
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. -}
|
2020-01-14 16:35:08 +00:00
|
|
|
testEncryptedRemote scheme ks c keys = case Remote.Helper.Encryptable.extractCipher pc of
|
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 $
|
2020-01-14 16:35:08 +00:00
|
|
|
Remote.Helper.Encryptable.parseEncryptionConfig c
|
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
|
2015-09-09 22:06:49 +00:00
|
|
|
checkCipher encipher = Utility.Gpg.checkEncryptionStream gpgcmd encipher . Just
|
2013-11-14 21:03:49 +00:00
|
|
|
checkScheme Types.Crypto.Hybrid = scheme == "hybrid"
|
|
|
|
|
checkScheme Types.Crypto.PubKey = scheme == "pubkey"
|
|
|
|
|
checkKeys cip mvariant = do
|
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)
|
2016-05-23 21:27:15 +00:00
|
|
|
cipher <- Crypto.decryptCipher gpgcmd encparams cip
|
2013-11-14 21:03:49 +00:00
|
|
|
files <- filterM doesFileExist $
|
2019-01-14 17:03:35 +00:00
|
|
|
map ("dir" </>) $ concatMap (serializeKeys cipher) keys
|
2013-11-14 21:03:49 +00:00
|
|
|
return (not $ null files) <&&> allM (checkFile mvariant) files
|
|
|
|
|
checkFile mvariant filename =
|
2015-09-09 22:06:49 +00:00
|
|
|
Utility.Gpg.checkEncryptionFile gpgcmd filename $
|
2013-11-14 21:03:49 +00:00
|
|
|
if mvariant == Just Types.Crypto.PubKey then ks else Nothing
|
2019-12-11 18:12:22 +00:00
|
|
|
serializeKeys cipher = map fromRawFilePath .
|
|
|
|
|
Annex.Locations.keyPaths .
|
2013-11-14 21:03:49 +00:00
|
|
|
Crypto.encryptKey Types.Crypto.HmacSha1 cipher
|
2013-05-17 20:49:34 +00:00
|
|
|
#else
|
2014-12-30 21:02:51 +00:00
|
|
|
test_crypto = putStrLn "gpg testing not implemented on Windows"
|
2013-05-17 20:49:34 +00:00
|
|
|
#endif
|
2011-12-21 03:20:36 +00:00
|
|
|
|
2014-12-30 20:58:02 +00:00
|
|
|
test_add_subdirs :: Assertion
|
|
|
|
|
test_add_subdirs = intmpclonerepo $ do
|
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
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" ["dir"] @? "add of subdir failed"
|
2014-02-07 00:33:30 +00:00
|
|
|
|
|
|
|
|
{- Regression test for Windows bug where symlinks were not
|
|
|
|
|
- calculated correctly for files in subdirs. -}
|
2019-08-09 15:06:54 +00:00
|
|
|
unlessM (hasUnlockedFiles <$> getTestMode) $ do
|
2016-02-16 19:30:59 +00:00
|
|
|
git_annex "sync" [] @? "sync failed"
|
2019-01-01 18:54:06 +00:00
|
|
|
l <- annexeval $ Utility.FileSystemEncoding.decodeBL
|
2020-04-07 21:41:09 +00:00
|
|
|
<$> Annex.CatFile.catObject (Git.Types.Ref (encodeBS "HEAD:dir/foo"))
|
2016-02-16 19:30:59 +00:00
|
|
|
"../.git/annex/" `isPrefixOf` l @? ("symlink from subdir to .git/annex is wrong: " ++ l)
|
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
|
2014-02-07 00:33:30 +00:00
|
|
|
setCurrentDirectory "dir"
|
2014-12-30 20:58:02 +00:00
|
|
|
git_annex "add" [".." </> "dir2"] @? "add of ../subdir failed"
|
2014-02-07 00:33:30 +00:00
|
|
|
|
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)
|
2015-02-10 19:20:07 +00:00
|
|
|
f <- absPath "myurl"
|
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"
|
2018-10-30 14:49:39 +00:00
|
|
|
git_annex_shouldfail "addurl" [url] @? "addurl failed to fail on file url"
|
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
|
|
|
filecmd "addurl" [url] @? ("addurl failed on " ++ url)
|
2015-02-10 19:20:07 +00:00
|
|
|
let dest = "addurlurldest"
|
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
|
|
|
filecmd "addurl" ["--file", dest, url] @? ("addurl failed on " ++ url ++ " with --file")
|
2015-02-10 19:20:07 +00:00
|
|
|
doesFileExist dest @? (dest ++ " missing after addurl --file")
|
2019-03-06 20:49:33 +00:00
|
|
|
|
|
|
|
|
test_export_import :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_export_import = intmpclonerepo $ do
|
2019-03-06 20:49:33 +00:00
|
|
|
createDirectory "dir"
|
|
|
|
|
git_annex "initremote" (words "foo type=directory encryption=none directory=dir exporttree=yes importtree=yes") @? "initremote failed"
|
|
|
|
|
git_annex "get" [] @? "get of files failed"
|
|
|
|
|
annexed_present annexedfile
|
|
|
|
|
|
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
|
2020-06-23 21:41:50 +00:00
|
|
|
origbranch <- annexeval origBranch
|
|
|
|
|
git_annex "export" [origbranch, "--to", "foo"] @? "export to dir failed"
|
2019-03-06 20:49:33 +00:00
|
|
|
dircontains annexedfile (content annexedfile)
|
|
|
|
|
|
|
|
|
|
writedir "import" (content "import")
|
2020-06-23 21:41:50 +00:00
|
|
|
git_annex "import" [origbranch, "--from", "foo"] @? "import from dir failed"
|
|
|
|
|
git_annex "merge" ["foo/" ++ origbranch] @? "git annex merge failed"
|
2019-08-09 17:33:29 +00:00
|
|
|
annexed_present_imported "import"
|
2019-03-06 20:49:33 +00:00
|
|
|
|
|
|
|
|
nukeFile "import"
|
|
|
|
|
writecontent "import" (content "newimport1")
|
|
|
|
|
git_annex "add" ["import"] @? "add of import failed"
|
2019-08-09 17:33:29 +00:00
|
|
|
commitchanges
|
2020-06-23 21:41:50 +00:00
|
|
|
git_annex "export" [origbranch, "--to", "foo"] @? "export modified file to dir failed"
|
2019-03-06 20:49:33 +00:00
|
|
|
dircontains "import" (content "newimport1")
|
|
|
|
|
|
|
|
|
|
-- verify that export refuses to overwrite modified file
|
|
|
|
|
writedir "import" (content "newimport2")
|
|
|
|
|
nukeFile "import"
|
|
|
|
|
writecontent "import" (content "newimport3")
|
|
|
|
|
git_annex "add" ["import"] @? "add of import failed"
|
2019-08-09 17:33:29 +00:00
|
|
|
commitchanges
|
2020-06-23 21:41:50 +00:00
|
|
|
git_annex_shouldfail "export" [origbranch, "--to", "foo"] @? "export failed to fail in conflict"
|
2019-03-06 20:49:33 +00:00
|
|
|
dircontains "import" (content "newimport2")
|
|
|
|
|
|
|
|
|
|
-- resolving import conflict
|
2020-06-23 21:41:50 +00:00
|
|
|
git_annex "import" [origbranch, "--from", "foo"] @? "import from dir failed"
|
2019-03-06 20:49:33 +00:00
|
|
|
not <$> boolSystem "git" [Param "merge", Param "foo/master", Param "-mmerge"] @? "git merge of conflict failed to exit nonzero"
|
|
|
|
|
nukeFile "import"
|
|
|
|
|
writecontent "import" (content "newimport3")
|
|
|
|
|
git_annex "add" ["import"] @? "add of import failed"
|
2019-08-09 17:33:29 +00:00
|
|
|
commitchanges
|
2020-06-23 21:41:50 +00:00
|
|
|
git_annex "export" [origbranch, "--to", "foo"] @? "export failed after import conflict"
|
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)
|
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.
|
|
|
|
|
commitchanges = git_annex "sync" ["--no-pull", "--no-push"] @? "sync failed"
|
2019-05-06 18:24:42 +00:00
|
|
|
|
|
|
|
|
test_export_import_subdir :: Assertion
|
2019-08-26 19:07:10 +00:00
|
|
|
test_export_import_subdir = intmpclonerepo $ do
|
2019-05-06 18:24:42 +00:00
|
|
|
createDirectory "dir"
|
|
|
|
|
git_annex "initremote" (words "foo type=directory encryption=none directory=dir exporttree=yes importtree=yes") @? "initremote failed"
|
|
|
|
|
git_annex "get" [] @? "get of files failed"
|
|
|
|
|
annexed_present annexedfile
|
|
|
|
|
|
|
|
|
|
createDirectory subdir
|
|
|
|
|
boolSystem "git" [Param "mv", File annexedfile, File subannexedfile]
|
|
|
|
|
@? "git mv failed"
|
|
|
|
|
boolSystem "git" [Param "commit", Param "-m", Param "moved"]
|
|
|
|
|
@? "git commit failed"
|
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.
|
2019-08-08 18:33:46 +00:00
|
|
|
git_annex "sync" ["--no-pull", "--no-push"] @? "sync failed"
|
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
|
2020-06-23 21:41:50 +00:00
|
|
|
origbranch <- annexeval origBranch
|
|
|
|
|
git_annex "export" [origbranch++":"++subdir, "--to", "foo"] @? "export of subdir failed"
|
2019-05-06 18:24:42 +00:00
|
|
|
dircontains annexedfile (content annexedfile)
|
|
|
|
|
|
|
|
|
|
testimport = do
|
2020-06-23 21:41:50 +00:00
|
|
|
origbranch <- annexeval origBranch
|
|
|
|
|
git_annex "import" [origbranch++":"++subdir, "--from", "foo"] @? "import of subdir failed"
|
2019-08-09 17:21:15 +00:00
|
|
|
git_annex "merge" ["foo/master"] @? "git annex merge foo/master failed"
|
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
|