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

2005 lines
76 KiB
Haskell
Raw Normal View History

added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
{- git-annex test suite
-
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
- Copyright 2010-2016 Joey Hess <id@joeyh.name>
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
-
- Licensed under the GNU GPL version 3 or higher.
-}
try building test suite on windows
2013-05-17 20:45:44 +00:00
{-# LANGUAGE CPP #-}
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
module Test where
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
import Types.Test
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
import Options.Applicative.Types
#ifndef WITH_TESTSUITE
import Options.Applicative (pure)
optParser :: Parser ()
optParser = pure ()
runner :: Maybe (() -> IO ())
runner = Nothing
#else
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
import Test.Tasty
import Test.Tasty.Runners
import Test.Tasty.HUnit
import Test.Tasty.QuickCheck
Revert "temporarily revert tasty-rerun support for this release" This reverts commit 8fcf041159d06986b5a11a3eddd115b4c71a39d8.
2014-01-27 18:22:44 +00:00
import Test.Tasty.Ingredients.Rerun
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
import Options.Applicative (switch, long, help)
move quickcheck Arbitrary declaration into test suite So git-annex can build w/o quickcheck installed.
2011-04-25 19:28:41 +00:00
test unused et al
2011-01-12 05:58:23 +00:00
import qualified Data.Map as M
Stop depending on testpack.
2013-02-28 03:21:43 +00:00
import qualified Text.JSON
better test framework
2010-11-02 21:08:16 +00:00
factor out common imports no code changes
2011-10-04 02:24:57 +00:00
import Common
split groups of related functions out of Utility
2011-08-22 20:14:12 +00:00
factor out common imports no code changes
2011-10-04 02:24:57 +00:00
import qualified Utility.SafeCommand
test locationlog contents too
2011-01-11 19:43:29 +00:00
import qualified Annex
break out non-log stuff to separate module
2011-10-15 21:47:03 +00:00
import qualified Annex.UUID
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
import qualified Annex.Version
test locationlog contents too
2011-01-11 19:43:29 +00:00
import qualified Backend
Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR. The environment needs to override git-config. Changed when git config is read, and avoid rereading it once it's been read. chdir for both worktree settings.
2012-05-18 22:20:53 +00:00
import qualified Git.CurrentRepo
split out two more Git modules
2011-12-13 19:22:43 +00:00
import qualified Git.Filename
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
import qualified Git.Construct
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
import qualified Git.Types
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
import qualified Git.Ref
import qualified Git.LsTree
fix test case to convert slashes for DOS
2014-03-04 19:06:40 +00:00
import qualified Git.FilePath
remove 163 lines of code without changing anything except imports
2016-01-20 20:36:33 +00:00
import qualified Annex.Locations
fix test suite build
2012-06-21 17:04:24 +00:00
import qualified Types.KeySource
fix test suite
2011-06-14 01:51:52 +00:00
import qualified Types.Backend
test
2012-12-20 03:43:15 +00:00
import qualified Types.TrustLevel
successfully split Annex and AnnexState out of TypeInternals
2011-01-26 01:49:04 +00:00
import qualified Types
factored out a generic MapLog from uuid-based logs UUIDBased is just a MapLog with a UUID for the field.
2014-03-15 17:44:31 +00:00
import qualified Logs.MapLog
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
import qualified Logs.Trust
import qualified Logs.Remote
fix build
2012-05-06 00:11:08 +00:00
import qualified Logs.Unused
quickcheck test for transfer info read/write code Fixed a bug the quickcheck turned up.
2012-12-19 20:15:39 +00:00
import qualified Logs.Transfer
more quickcheck fun and the code gets better..
2012-12-20 02:14:12 +00:00
import qualified Logs.Presence
disable debug output in test suite Added during a dev session in Jan and kept accidentially.
2015-06-17 17:49:29 +00:00
import qualified Logs.PreferredContent
data types and serialization for metadata A very haskell commit! Just data types, instances to serialize the metadata to a nice format, and QuickCheck tests. This commit was sponsored by Andreas Leha.
2014-02-12 21:54:28 +00:00
import qualified Types.MetaData
convert test to Remote
2011-03-27 20:58:28 +00:00
import qualified Remote
fix test suite
2011-06-14 01:51:52 +00:00
import qualified Types.Key
fix test suite build
2012-04-30 17:59:05 +00:00
import qualified Types.Messages
a few fixes for the test suite in direct mode Still far from working.
2013-05-15 21:44:30 +00:00
import qualified Config
split cost out into its own module Added a function to insert a new cost into a list, which could be used to asjust costs after a drag and drop.
2013-03-13 20:16:01 +00:00
import qualified Config.Cost
add test to ensure hmac remains stable
2011-04-21 20:56:24 +00:00
import qualified Crypto
reorg
2015-12-15 19:34:28 +00:00
import qualified Annex.WorkTree
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
import qualified Annex.Link
reorg
2014-01-26 20:36:31 +00:00
import qualified Annex.Init
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
import qualified Annex.CatFile
filter branches (incomplete) Promosing work toward metadata driven filter branches. A few methods to construct them are stubbed out; all the data types and pure code seems good. This commit was sponsored by Walter Somerville.
2014-02-16 21:39:54 +00:00
import qualified Annex.View
change directory encoding in ViewedFile such that the original directory can be extracted from it
2014-02-22 18:54:53 +00:00
import qualified Annex.View.ViewedFile
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
import qualified Logs.View
split groups of related functions out of Utility
2011-08-22 20:14:12 +00:00
import qualified Utility.Path
fix
2011-09-28 19:17:45 +00:00
import qualified Utility.FileMode
test encrypted special remote This involved adding a test harness to run gpg with a dummy key, and lots of fun.
2011-12-21 03:20:36 +00:00
import qualified Build.SysConfig
handle C-style escapes in Format I was happily able to repurpose some code from Git.Filename to handle this. I remember writing that code... a whole afternoon at a coffee shop, after which I felt I'd struggled with Haskell and git, and sorta lost, in needing to write this nasty peice of code. But was also pleased at the use of a pair of functions and quickcheck that allowed me to get it 100% right. So, turns out I not only got it right, but the code wasn't as special-purpose as I'd feared. Yay!
2011-12-23 00:14:35 +00:00
import qualified Utility.Format
broke out Verifiable to a utility library, and added a quickcheck test
2012-09-08 03:23:52 +00:00
import qualified Utility.Verifiable
test: Fix threaded runtime hang. There was one forkProcess lurking in test.hs, and that seems to be responsible for recent buildd failures on amd64 and armhf. I was able to reproduce it pretty easily on amd64, and even once on i386, and it was clearly that same bad old threaded runtime hang. So removing this forkProcess should fix it. Odd that it lurked for some months before popping up.
2012-10-11 17:45:09 +00:00
import qualified Utility.Process
Bug fix: A recent change caused git-annex-shell to crash.
2012-10-16 02:22:40 +00:00
import qualified Utility.Misc
split out Utility.InodeCache
2013-02-14 20:17:40 +00:00
import qualified Utility.InodeCache
clean up from windows porting
2013-05-11 22:23:41 +00:00
import qualified Utility.Env
Fix bug in parsing of parens in some preferred content expressions. This fixes the behavior of the manual mode group. The current manual mode preferred content expression is: "present and (((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) or (not copies=semitrusted+:1))" The old matcher misparsed this, to basically: OR (present and (...)) (not copies=semitrusted+:1)) The paren handling and indeed the whole conversion from tokens to the matcher was just wrong. The new way may not be the cleverest, but I think it is correct, and you can see how it pattern matches structurally against the expressions when parsing them. That expression is now parsed to: MAnd (MOp <function>) (MOr (MOr (MAnd (MOp <function>) (MOp <function>)) (MNot (MOr (MOp <function>) (MOp <function>)))) (MNot (MOp <function>))) Which appears correct, and behaves correct in testing. Also threw in a simplifier, so the final generated Matcher has less unnecessary clutter in it. Mostly so that I could more easily read & confirm them. Also, added a simple test of the Matcher to the test suite. There is a small chance of badly formed preferred content expressions behaving differently than before due to this rewrite.
2013-05-25 01:33:54 +00:00
import qualified Utility.Matcher
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
import qualified Utility.Exception
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Utility.Hash
import qualified Utility.Scheduled
reorg quickcheck to a separate module
2015-11-17 19:49:22 +00:00
import qualified Utility.Scheduled.QuickCheck
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Utility.HumanTime
try harder to delete test dir on windows
2014-02-03 15:38:20 +00:00
import qualified Utility.ThreadScheduler
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
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
import qualified Utility.Tmp
uninit: Avoid failing final removal in some direct mode repositories due to file modes. Specifically .map files.
2014-07-11 18:52:53 +00:00
import qualified Command.Uninit
reorganize some files and imports
2014-01-26 20:25:55 +00:00
import qualified CmdLine.GitAnnex as GitAnnex
fix windows build
2014-10-16 19:54:02 +00:00
#ifndef mingw32_HOST_OS
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
import qualified Remote.Helper.Encryptable
import qualified Types.Crypto
import qualified Utility.Gpg
ssh warnings
2013-05-17 20:51:46 +00:00
#endif
add a stupid test harness
2010-11-02 20:49:35 +00:00
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
optParser :: Parser TestOptions
optParser = TestOptions
<$> suiteOptionParser ingredients (tests mempty)
<*> switch
( long "keep-failures"
<> help "preserve repositories on test failure"
)
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
runner :: Maybe (TestOptions -> IO ())
runner = Just $ \opts -> case tryIngredients ingredients (tastyOptionSet opts) (tests opts) of
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
Nothing -> error "No tests found!?"
Just act -> ifM act
( exitSuccess
, do
putStrLn " (This could be due to a bug in git-annex, or an incompatability"
putStrLn " with utilities, such as git, installed on this system.)"
exitFailure
)
expose tasty test suite's option parser
2014-01-21 04:08:43 +00:00
ingredients :: [Ingredient]
ingredients =
test: Fix --list-tests Seems list order matters, I don't know why, but have reported it on #tasty
2015-03-31 18:47:27 +00:00
[ listingTests
, rerunningTests [consoleTestReporter]
expose tasty test suite's option parser
2014-01-21 04:08:43 +00:00
]
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
tests :: TestOptions -> TestTree
tests opts = testGroup "Tests" $ properties :
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
map (\(d, te) -> withTestMode te (unitTests d)) testmodes
where
testmodes =
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
[ ("v6 unlocked", (testMode opts "6") { unlockedFiles = True })
, ("v6 locked", testMode opts "6")
, ("v5", testMode opts "5")
refactor
2015-07-08 04:03:28 +00:00
#ifndef mingw32_HOST_OS
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
-- Windows will only use direct mode, so don't test twice.
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
, ("v5 direct", (testMode opts "5") { forceDirect = True })
refactor
2015-07-08 04:03:28 +00:00
#endif
fix build on windows
2015-12-28 16:57:42 +00:00
]
refactor
2015-07-08 04:03:28 +00:00
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
properties :: TestTree
use tasty resources
2014-01-21 18:04:50 +00:00
properties = localOption (QuickCheckTests 1000) $ testGroup "QuickCheck"
fix use of hifalutin terminology
2015-11-16 18:37:31 +00:00
[ testProperty "prop_isomorphic_deencode_git" Git.Filename.prop_isomorphic_deencode
, testProperty "prop_isomorphic_deencode" Utility.Format.prop_isomorphic_deencode
remove 163 lines of code without changing anything except imports
2016-01-20 20:36:33 +00:00
, testProperty "prop_isomorphic_fileKey" Annex.Locations.prop_isomorphic_fileKey
fix use of hifalutin terminology
2015-11-16 18:37:31 +00:00
, testProperty "prop_isomorphic_key_encode" Types.Key.prop_isomorphic_key_encode
, testProperty "prop_isomorphic_key_decode" Types.Key.prop_isomorphic_key_decode
, 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
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_parse_show_Config" Logs.Remote.prop_parse_show_Config
convert parentDir to be based on takeDirectory, but fixed for trailing /
2015-01-09 18:26:52 +00:00
, testProperty "prop_upFrom_basics" Utility.Path.prop_upFrom_basics
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_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
factored out a generic MapLog from uuid-based logs UUIDBased is just a MapLog with a UUID for the field.
2014-03-15 17:44:31 +00:00
, testProperty "prop_TimeStamp_sane" Logs.MapLog.prop_TimeStamp_sane
, testProperty "prop_addMapLog_sane" Logs.MapLog.prop_addMapLog_sane
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
, testProperty "prop_verifiable_sane" Utility.Verifiable.prop_verifiable_sane
, testProperty "prop_segment_regressionTest" Utility.Misc.prop_segment_regressionTest
, testProperty "prop_read_write_transferinfo" Logs.Transfer.prop_read_write_transferinfo
, testProperty "prop_read_show_inodecache" Utility.InodeCache.prop_read_show_inodecache
, testProperty "prop_parse_show_log" Logs.Presence.prop_parse_show_log
, testProperty "prop_read_show_TrustLevel" Types.TrustLevel.prop_read_show_TrustLevel
, testProperty "prop_parse_show_TrustLog" Logs.Trust.prop_parse_show_TrustLog
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
, testProperty "prop_hashes_stable" Utility.Hash.prop_hashes_stable
add test for stable macs
2015-04-19 14:52:49 +00:00
, testProperty "prop_mac_stable" Utility.Hash.prop_mac_stable
reorg quickcheck to a separate module
2015-11-17 19:49:22 +00:00
, testProperty "prop_schedule_roundtrips" Utility.Scheduled.QuickCheck.prop_schedule_roundtrips
add new test
2014-04-12 18:19:56 +00:00
, testProperty "prop_past_sane" Utility.Scheduled.prop_past_sane
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
, testProperty "prop_duration_roundtrips" Utility.HumanTime.prop_duration_roundtrips
fix metadata log simplifier and additional quickcheck tests
2014-02-13 02:27:55 +00:00
, testProperty "prop_metadata_sane" Types.MetaData.prop_metadata_sane
data types and serialization for metadata A very haskell commit! Just data types, instances to serialize the metadata to a nice format, and QuickCheck tests. This commit was sponsored by Andreas Leha.
2014-02-12 21:54:28 +00:00
, testProperty "prop_metadata_serialize" Types.MetaData.prop_metadata_serialize
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
, testProperty "prop_branchView_legal" Logs.View.prop_branchView_legal
view: Avoid using cute unicode homomorphs for '/' and '\' and instead use ugly escaping, as the unicode method doesn't work on non-unicode supporting systems.
2016-01-08 16:45:32 +00:00
, testProperty "prop_viewPath_roundtrips" Annex.View.prop_viewPath_roundtrips
add another quickcheck property, and several edge cases handled
2014-02-17 01:00:12 +00:00
, testProperty "prop_view_roundtrips" Annex.View.prop_view_roundtrips
change directory encoding in ViewedFile such that the original directory can be extracted from it
2014-02-22 18:54:53 +00:00
, testProperty "prop_viewedFile_rountrips" Annex.View.ViewedFile.prop_viewedFile_roundtrips
metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character. The fix is to stop using w82s, which does not properly reconstitute unicode strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This passes unicode through perfectly, including any invalid filesystem encoded characters. Note that toB64 / fromB64 are also used for creds and cipher embedding. It would be unfortunate if this change broke those uses. For cipher embedding, note that ciphers can contain arbitrary bytes (should really be using ByteString.Char8 there). Testing indicated it's not safe to use the new fromB64 there; I think that characters were incorrectly combined. For credpair embedding, the username or password could contain unicode. Before, that unicode would fail to round-trip through the b64. So, I guess this is not going to break any embedded creds that worked before. This bug may have affected some creds before, and if so, this change will not fix old ones, but should fix new ones at least.
2015-03-04 15:16:03 +00:00
, testProperty "prop_b64_roundtrips" Utility.Base64.prop_b64_roundtrips
add test case that all standard group preferred content expressions parse
2015-06-17 17:44:19 +00:00
, testProperty "prop_standardGroups_parse" Logs.PreferredContent.prop_standardGroups_parse
better test framework
2010-11-02 21:08:16 +00:00
]
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
{- These tests set up the test environment, but also test some basic parts
- of git-annex. They are always run before the unitTests. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
initTests :: TestTree
initTests = testGroup "Init Tests"
[ testCase "init" test_init
, testCase "add" test_add
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
unitTests :: String -> TestTree
unitTests note = testGroup ("Unit Tests " ++ note)
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
[ testCase "add dup" test_add_dup
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "add extras" test_add_extras
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
, testCase "shared clone" test_shared_clone
log: Fix reversion introduced in version 5.20150528 that broke this command.
2015-07-02 16:53:38 +00:00
, testCase "log" test_log
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
, testCase "import" test_import
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "reinject" test_reinject
, testCase "unannex (no copy)" test_unannex_nocopy
, testCase "unannex (with copy)" test_unannex_withcopy
, testCase "drop (no remote)" test_drop_noremote
, testCase "drop (with remote)" test_drop_withremote
, testCase "drop (untrusted remote)" test_drop_untrustedremote
, testCase "get" test_get
, testCase "move" test_move
, testCase "copy" test_copy
, testCase "lock" test_lock
, testCase "edit (no pre-commit)" test_edit
, testCase "edit (pre-commit)" test_edit_precommit
, testCase "partial commit" test_partial_commit
, testCase "fix" test_fix
add a test case for switching to direct mode and back to indirect
2015-02-09 17:41:29 +00:00
, testCase "direct" test_direct
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "trust" test_trust
, testCase "fsck (basics)" test_fsck_basic
, testCase "fsck (bare)" test_fsck_bare
, testCase "fsck (local untrusted)" test_fsck_localuntrusted
, testCase "fsck (remote untrusted)" test_fsck_remoteuntrusted
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113. The directory special remote was not affected in its normal configuration, since annex-directory is an absolute path normally. But it could fail when a relative path was used. The git remote was affected even when an absolute path to it was used in .git/config, since git-annex now converts all such paths to relative.
2015-04-18 17:36:12 +00:00
, testCase "fsck --from remote" test_fsck_fromremote
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "migrate" test_migrate
, testCase "migrate (via gitattributes)" test_migrate_via_gitattributes
, testCase "unused" test_unused
, testCase "describe" test_describe
, testCase "find" test_find
, testCase "merge" test_merge
, testCase "info" test_info
, testCase "version" test_version
, testCase "sync" test_sync
, testCase "union merge regression" test_union_merge_regression
, testCase "conflict resolution" test_conflict_resolution
, testCase "conflict resolution movein regression" test_conflict_resolution_movein_regression
, testCase "conflict resolution (mixed directory and file)" test_mixed_conflict_resolution
, testCase "conflict resolution symlink bit" test_conflict_resolution_symlink_bit
, testCase "conflict resolution (uncommitted local file)" test_uncommitted_conflict_resolution
, testCase "conflict resolution (removed file)" test_remove_conflict_resolution
, testCase "conflict resolution (nonannexed file)" test_nonannexed_file_conflict_resolution
, testCase "conflict resolution (nonannexed symlink)" test_nonannexed_symlink_conflict_resolution
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
, testCase "conflict resolution (mixed locked and unlocked file)" test_mixed_lock_conflict_resolution
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, testCase "map" test_map
, testCase "uninit" test_uninit
, testCase "uninit (in git-annex branch)" test_uninit_inbranch
, testCase "upgrade" test_upgrade
, testCase "whereis" test_whereis
, testCase "hook remote" test_hook_remote
, testCase "directory remote" test_directory_remote
, testCase "rsync remote" test_rsync_remote
, testCase "bup remote" test_bup_remote
, testCase "crypto" test_crypto
, testCase "preferred content" test_preferred_content
, testCase "add subdirs" test_add_subdirs
test case for addurl file://
2015-02-10 19:20:07 +00:00
, testCase "addurl" test_addurl
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
]
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
-- this test case create the main repo
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_init :: Assertion
test_init = innewrepo $ do
pass --version to init when needed
2015-12-16 17:14:18 +00:00
ver <- annexVersion <$> getTestMode
if ver == Annex.Version.defaultVersion
then git_annex "init" [reponame] @? "init failed"
else git_annex "init" [reponame, "--version", ver] @? "init failed"
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
setupTestMode
where indenting
2012-11-11 04:51:07 +00:00
where
reponame = "test repo"
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
-- this test case runs in the main repo, to set up a basic
-- annexed file that later tests will use
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add :: Assertion
test_add = inmainrepo $ do
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
writeFile annexedfile $ content annexedfile
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex annexedfile @? "add failed"
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
annexed_present annexedfile
writeFile sha1annexedfile $ content sha1annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [sha1annexedfile, "--backend=SHA1"] @? "add with SHA1 failed"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
whenM (unlockedFiles <$> getTestMode) $
git_annex "unlock" [sha1annexedfile] @? "unlock failed"
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
annexed_present sha1annexedfile
checkbackend sha1annexedfile backendSHA1
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
ifM (annexeval Config.isDirect)
( do
writeFile ingitfile $ content ingitfile
not <$> boolSystem "git" [Param "add", File ingitfile] @? "git add failed to fail in direct mode"
use nukefile rather than shelling to rm
2014-02-10 22:29:15 +00:00
nukeFile ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
, do
writeFile ingitfile $ content ingitfile
boolSystem "git" [Param "add", File ingitfile] @? "git add failed"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "commit"] @? "git commit failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [ingitfile] @? "add ingitfile should be no-op"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
)
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
test_add_dup :: Assertion
test_add_dup = intmpclonerepo $ do
writeFile annexedfiledup $ content annexedfiledup
add_annex annexedfiledup @? "add of second file with same content failed"
annexed_present annexedfiledup
annexed_present annexedfile
test suite partially converted to use tasty test framework This is a win. Will need to wait for tasty getting into Debian, and do a trivial conversion of the remainder of the hunit tests.
2013-08-06 04:12:06 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add_extras :: Assertion
test_add_extras = intmpclonerepo $ do
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
writeFile wormannexedfile $ content wormannexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [wormannexedfile, "--backend=WORM"] @? "add with WORM failed"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
whenM (unlockedFiles <$> getTestMode) $
git_annex "unlock" [wormannexedfile] @? "unlock failed"
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
annexed_present wormannexedfile
checkbackend wormannexedfile backendWORM
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
test_shared_clone :: Assertion
test_shared_clone = intmpsharedclonerepo $ do
v <- catchMaybeIO $ Utility.Process.readProcess "git"
[ "config"
, "--bool"
, "--get"
, "annex.hardlink"
]
v == Just "true\n"
@? "shared clone of repo did not get annex.hardlink set"
log: Fix reversion introduced in version 5.20150528 that broke this command.
2015-07-02 16:53:38 +00:00
test_log :: Assertion
test_log = intmpclonerepo $ do
git_annex "log" [annexedfile] @? "log failed"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
test_import :: Assertion
test_import = intmpclonerepo $ Utility.Tmp.withTmpDir "importtest" $ \importdir -> do
(toimport1, importf1, imported1) <- mktoimport importdir "import1"
git_annex "import" [toimport1] @? "import failed"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present_locked imported1
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist importf1
(toimport2, importf2, imported2) <- mktoimport importdir "import2"
git_annex "import" [toimport2] @? "import of duplicate failed"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present_locked imported2
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist importf2
(toimport3, importf3, imported3) <- mktoimport importdir "import3"
git_annex "import" ["--skip-duplicates", toimport3]
@? "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"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present_locked imported5
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkexists importf5
git_annex "drop" ["--force", imported1, imported2, imported5] @? "drop failed"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_notpresent_locked imported2
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
(toimportdup, importfdup, importeddup) <- mktoimport importdir "importdup"
git_annex "import" ["--clean-duplicates", toimportdup]
@? "import of missing duplicate with --clean-duplicates failed"
checkdoesnotexist importeddup
checkexists importfdup
where
mktoimport importdir subdir = do
createDirectory (importdir </> subdir)
let importf = subdir </> "f"
writeFile (importdir </> importf) (content importf)
return (importdir </> subdir, importdir </> importf, importf)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_reinject :: Assertion
test_reinject = intmpclonerepoInDirect $ do
git_annex "drop" ["--force", sha1annexedfile] @? "drop failed"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_notpresent sha1annexedfile
add tests of setkey/fromkey
2011-01-11 23:59:11 +00:00
writeFile tmp $ content sha1annexedfile
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
key <- Types.Key.key2file <$> getKey backendSHA1 tmp
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present sha1annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed for dup"
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present_locked sha1annexedfiledup
where indenting
2012-11-11 04:51:07 +00:00
where
tmp = "tmpfile"
add tests of setkey/fromkey
2011-01-11 23:59:11 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unannex_nocopy :: Assertion
test_unannex_nocopy = intmpclonerepo $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unannex" [annexedfile] @? "unannex failed with no copy"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unannex_withcopy :: Assertion
test_unannex_withcopy = intmpclonerepo $ do
git_annex "get" [annexedfile] @? "get failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unannex" [annexedfile, sha1annexedfile] @? "unannex failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unannex" [annexedfile] @? "unannex failed on non-annexed file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed annexedfile
unlessM (annexeval Config.isDirect) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unannex" [ingitfile] @? "unannex ingitfile should be no-op"
where indenting
2012-11-11 04:51:07 +00:00
unannexed ingitfile
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_noremote :: Assertion
test_drop_noremote = intmpclonerepo $ do
git_annex "get" [annexedfile] @? "get failed"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "rm", Param "origin"]
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
@? "git remote rm origin failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile] @? "drop wrongly succeeded with no known copy of file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" ["--force", annexedfile] @? "drop --force failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile] @? "drop of dropped file failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unlessM (annexeval Config.isDirect) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [ingitfile] @? "drop ingitfile should be no-op"
where indenting
2012-11-11 04:51:07 +00:00
unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_withremote :: Assertion
test_drop_withremote = intmpclonerepo $ do
git_annex "get" [annexedfile] @? "get failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "numcopies" ["2"] @? "numcopies config failed"
not <$> git_annex "drop" [annexedfile] @? "drop succeeded although numcopies is not satisfied"
git_annex "numcopies" ["1"] @? "numcopies config failed"
git_annex "drop" [annexedfile] @? "drop failed though origin has copy"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
Windows: Fix bug in dropping an annexed file, which caused a symlink to be staged that contained backslashes.
2015-02-09 19:24:33 +00:00
-- make sure that the correct symlink is staged for the file
-- after drop
git_annex_expectoutput "status" [] []
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_drop_untrustedremote :: Assertion
test_drop_untrustedremote = intmpclonerepo $ do
git_annex "untrust" ["origin"] @? "untrust of origin failed"
git_annex "get" [annexedfile] @? "get failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile] @? "drop wrongly suceeded with only an untrusted copy of the file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_get :: Assertion
test_get = intmpclonerepo $ do
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file already here failed"
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unlessM (annexeval Config.isDirect) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [ingitfile] @? "get ingitfile should be no-op"
inmainrepo $ unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
more tests
2011-01-07 05:02:06 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_move :: Assertion
test_move = intmpclonerepo $ do
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
git_annex "move" ["--from", "origin", annexedfile] @? "move --from of file failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_notpresent annexedfile
git_annex "move" ["--from", "origin", annexedfile] @? "move --from of file already here failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_notpresent annexedfile
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file failed"
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file already there failed"
inmainrepo $ annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unlessM (annexeval Config.isDirect) $ do
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
git_annex "move" ["--to", "origin", ingitfile] @? "move of ingitfile should be no-op"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
git_annex "move" ["--from", "origin", ingitfile] @? "move of ingitfile should be no-op"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_copy :: Assertion
test_copy = intmpclonerepo $ do
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
git_annex "copy" ["--from", "origin", annexedfile] @? "copy --from of file failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
git_annex "copy" ["--from", "origin", annexedfile] @? "copy --from of file already here failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
git_annex "copy" ["--to", "origin", annexedfile] @? "copy --to of file already there failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
git_annex "move" ["--to", "origin", annexedfile] @? "move --to of file already there failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ annexed_present annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unlessM (annexeval Config.isDirect) $ do
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
git_annex "copy" ["--to", "origin", ingitfile] @? "copy of ingitfile should be no-op"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unannexed ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo $ unannexed ingitfile
git_annex "copy" ["--from", "origin", ingitfile] @? "copy of ingitfile should be no-op"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkregularfile ingitfile
checkcontent ingitfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_preferred_content :: Assertion
test_preferred_content = intmpclonerepo $ do
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
-- get/copy --auto looks only at numcopies when preferred content is not
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
-- set, and with 1 copy existing, does not get the file.
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with default preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
git_annex "copy" ["--from", "origin", "--auto", annexedfile] @? "copy --auto --from of file failed with default preferred content"
annexed_notpresent annexedfile
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
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"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
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
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "ungroup" [".", "client"] @? "ungroup failed"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "wanted" [".", "standard"] @? "set expression to standard failed"
git_annex "group" [".", "manual"] @? "set group to manual failed"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
-- drop --auto with manual leaves the file where it is
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" ["--auto", annexedfile] @? "drop --auto of file failed with manual preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile] @? "drop of file failed"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
-- copy/get --auto with manual does not get the file
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with manual preferred content"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
add test cases for copy --auto (Only --from for now, should add --to sometime but I'm on low sleep so this is the mininal test to catch the reversion just fixed, bad me for doing it backwards and incompletely.)
2015-10-06 21:35:29 +00:00
git_annex "copy" ["--from", "origin", "--auto", annexedfile] @? "copy --auto --from of file failed with manual preferred content"
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "ungroup" [".", "client"] @? "ungroup failed"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "wanted" [".", "exclude=*"] @? "set expression to exclude=* failed"
git_annex "get" [annexedfile] @? "get of file failed"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" ["--auto", annexedfile] @? "drop --auto of file failed with exclude=*"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" ["--auto", annexedfile] @? "get --auto of file failed with exclude=*"
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_lock :: Assertion
test_lock = intmpclonerepoInDirect $ do
unlock: Fix behavior when file content is not present.
2011-01-14 03:46:02 +00:00
annexed_notpresent annexedfile
fix test failure locking an unlocked not present file In v5, that was not possible, but it is in v6, and so the test was failing. Investigating, it turns out that locking was copying the pointer file content to the annex object despite the content not being present. So, add a check to prevent that.
2016-01-06 20:01:52 +00:00
ifM (unlockedFiles <$> getTestMode)
( not <$> git_annex "lock" [annexedfile] @? "lock failed to fail with not present file"
, not <$> git_annex "unlock" [annexedfile] @? "unlock failed to fail with not present file"
)
unlock: Fix behavior when file content is not present.
2011-01-14 03:46:02 +00:00
annexed_notpresent annexedfile
regression test for fd55563b02dd8fedbb2420f440603be7192d94dc
2015-01-02 17:59:25 +00:00
-- regression test: unlock of newly added, not committed file
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
-- should fail in v5 mode. In v6 mode, this is allowed.
regression test for fd55563b02dd8fedbb2420f440603be7192d94dc
2015-01-02 17:59:25 +00:00
writeFile "newfile" "foo"
git_annex "add" ["newfile"] @? "add new file failed"
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ifM (annexeval Annex.Version.versionSupportsUnlockedPointers)
( git_annex "unlock" ["newfile"] @? "unlock failed on newly added, never committed file in v6 repository"
, not <$> git_annex "unlock" ["newfile"] @? "unlock failed to fail on newly added, never committed file in v5 repository"
)
regression test for fd55563b02dd8fedbb2420f440603be7192d94dc
2015-01-02 17:59:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unlock" [annexedfile] @? "unlock failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
unannexed annexedfile
-- write different content, to verify that lock
-- throws it away
changecontent annexedfile
hlint tweaks Did all sources except Remotes/* and Command/*
2011-07-15 07:12:05 +00:00
writeFile annexedfile $ content annexedfile ++ "foo"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "lock" [annexedfile] @? "lock failed to fail without --force"
git_annex "lock" ["--force", annexedfile] @? "lock --force failed"
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
-- In v6 mode, the original content of the file is not always
-- preserved after modification, so re-get it.
git_annex "get" [annexedfile] @? "get of file failed after lock --force"
fix test file is locked here, so use right test.
2016-01-06 20:12:00 +00:00
annexed_present_locked annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unlock" [annexedfile] @? "unlock failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
unannexed annexedfile
changecontent annexedfile
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ifM (annexeval Annex.Version.versionSupportsUnlockedPointers)
( do
boolSystem "git" [Param "add", Param annexedfile] @? "add of modified file failed"
runchecks [checkregularfile, checkwritable] annexedfile
, do
git_annex "add" [annexedfile] @? "add of modified file failed"
runchecks [checklink, checkunwritable] annexedfile
)
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
c <- readFile annexedfile
hlint tweaks Did all sources except Remotes/* and Command/*
2011-07-15 07:12:05 +00:00
assertEqual "content of modified file" c (changedcontent annexedfile)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
r' <- git_annex "drop" [annexedfile]
unlock: Fix behavior when file content is not present.
2011-01-14 03:46:02 +00:00
not r' @? "drop wrongly succeeded with no known copy of modified file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_edit = test_edit' False
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit_precommit :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_edit_precommit = test_edit' True
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_edit' :: Bool -> Assertion
test_edit' precommit = intmpclonerepoInDirect $ do
git_annex "get" [annexedfile] @? "get of file failed"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "edit" [annexedfile] @? "edit failed"
where indenting
2012-11-11 04:51:07 +00:00
unannexed annexedfile
changecontent annexedfile
fix test
2013-05-16 02:10:49 +00:00
boolSystem "git" [Param "add", File annexedfile]
@? "git add of edited file failed"
where indenting
2012-11-11 04:51:07 +00:00
if precommit
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
then git_annex "pre-commit" []
fix test
2013-05-16 02:10:49 +00:00
@? "pre-commit failed"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
else boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "contentchanged"]
fix test
2013-05-16 02:10:49 +00:00
@? "git commit of edited file failed"
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ifM (annexeval Annex.Version.versionSupportsUnlockedPointers)
( runchecks [checkregularfile, checkwritable] annexedfile
, runchecks [checklink, checkunwritable] annexedfile
)
where indenting
2012-11-11 04:51:07 +00:00
c <- readFile annexedfile
assertEqual "content of modified file" c (changedcontent annexedfile)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile] @? "drop wrongly succeeded with no known copy of modified file"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_partial_commit :: Assertion
test_partial_commit = intmpclonerepoInDirect $ do
git_annex "get" [annexedfile] @? "get of file failed"
pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index I had hoped that the git devs could change git's handling of partial commits to not use a false index file, but seems not. So, this relies on some git internals to detect that case. The test suite has a test case added to catch it if changes to git break it. This commit was sponsored by Paul Tagliamonte.
2014-11-10 19:36:24 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unlock" [annexedfile] @? "unlock failed"
fix test have to change the content of unlocked file before committing otherwise git commit will fail in v6 mode when the file was already unlocked, because no changes have been made
2016-01-06 20:14:51 +00:00
changecontent annexedfile
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ifM (annexeval Annex.Version.versionSupportsUnlockedPointers)
( boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "test", File annexedfile]
@? "partial commit of unlocked file should be allowed in v6 repository"
, not <$> boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "test", File annexedfile]
@? "partial commit of unlocked file not blocked by pre-commit hook"
)
pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index I had hoped that the git devs could change git's handling of partial commits to not use a false index file, but seems not. So, this relies on some git internals to detect that case. The test suite has a test case added to catch it if changes to git break it. This commit was sponsored by Paul Tagliamonte.
2014-11-10 19:36:24 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fix :: Assertion
skip fix test in unlocked v6 pass fix is not relevant for unlocked files
2016-01-06 20:16:19 +00:00
test_fix = intmpclonerepoInDirect $ unlessM (unlockedFiles <$> getTestMode) $ do
more
2011-01-07 18:08:43 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "fix" [annexedfile] @? "fix of not present failed"
more
2011-01-07 18:08:43 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "fix" [annexedfile] @? "fix of present file failed"
more
2011-01-07 18:08:43 +00:00
annexed_present annexedfile
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
createDirectory subdir
split groups of related functions out of Utility
2011-08-22 20:14:12 +00:00
boolSystem "git" [Param "mv", File annexedfile, File subdir]
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
@? "git mv failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "fix" [newfile] @? "fix of moved file failed"
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
runchecks [checklink, checkunwritable] newfile
c <- readFile newfile
hlint tweaks Did all sources except Remotes/* and Command/*
2011-07-15 07:12:05 +00:00
assertEqual "content of moved file" c (content annexedfile)
where indenting
2012-11-11 04:51:07 +00:00
where
subdir = "s"
newfile = subdir ++ "/" ++ annexedfile
more tests
2011-01-07 01:39:26 +00:00
add a test case for switching to direct mode and back to indirect
2015-02-09 17:41:29 +00:00
test_direct :: Assertion
test_direct = intmpclonerepoInDirect $ do
git_annex "get" [annexedfile] @? "get of file failed"
annexed_present annexedfile
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ifM (annexeval Annex.Version.versionSupportsUnlockedPointers)
( not <$> git_annex "direct" [] @? "switch to direct mode failed to fail in v6 repository"
, do
git_annex "direct" [] @? "switch to direct mode failed"
annexed_present annexedfile
git_annex "indirect" [] @? "switch to indirect mode failed"
)
add a test case for switching to direct mode and back to indirect
2015-02-09 17:41:29 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_trust :: Assertion
test_trust = intmpclonerepo $ do
git_annex "trust" [repo] @? "trust failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.Trusted "trusted 1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "trust" [repo] @? "trust of trusted failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.Trusted "trusted 2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "untrust" [repo] @? "untrust failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.UnTrusted "untrusted 1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "untrust" [repo] @? "untrust of untrusted failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.UnTrusted "untrusted 2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "dead" [repo] @? "dead failed"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
trustcheck Logs.Trust.DeadTrusted "deadtrusted 1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "dead" [repo] @? "dead of dead failed"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
trustcheck Logs.Trust.DeadTrusted "deadtrusted 2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "semitrust" [repo] @? "semitrust failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.SemiTrusted "semitrusted 1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "semitrust" [repo] @? "semitrust of semitrusted failed"
reorganize log modules no code changes
2011-10-15 20:21:08 +00:00
trustcheck Logs.Trust.SemiTrusted "semitrusted 2"
where indenting
2012-11-11 04:51:07 +00:00
where
repo = "origin"
trustcheck expected msg = do
present <- annexeval $ do
l <- Logs.Trust.trustGet expected
u <- Remote.nameToUUID repo
return $ u `elem` l
assertBool msg present
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_fsck_basic :: Assertion
test_fsck_basic = intmpclonerepo $ do
git_annex "fsck" [] @? "fsck failed"
git_annex "numcopies" ["2"] @? "numcopies config failed"
fsck_should_fail "numcopies unsatisfied"
git_annex "numcopies" ["1"] @? "numcopies config failed"
tasty fully working
2013-11-15 00:09:47 +00:00
corrupt annexedfile
corrupt sha1annexedfile
where indenting
2012-11-11 04:51:07 +00:00
where
corrupt f = do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [f] @? "get of file failed"
where indenting
2012-11-11 04:51:07 +00:00
Utility.FileMode.allowWrite f
writeFile f (changedcontent f)
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
ifM (annexeval Config.isDirect <||> unlockedFiles <$> getTestMode)
( git_annex "fsck" [] @? "fsck failed on unlocked file with changed file content"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, not <$> git_annex "fsck" [] @? "fsck failed to fail with corrupted file content"
fsck behavior varies in direct mode when the file is modified
2013-05-17 19:20:21 +00:00
)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
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"
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113. The directory special remote was not affected in its normal configuration, since annex-directory is an absolute path normally. But it could fail when a relative path was used. The git remote was affected even when an absolute path to it was used in .git/config, since git-annex now converts all such paths to relative.
2015-04-18 17:36:12 +00:00
test_fsck_fromremote :: Assertion
test_fsck_fromremote = intmpclonerepo $ do
git_annex "fsck" ["--from", "origin"] @? "fsck --from origin failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
fsck_should_fail :: String -> Assertion
fsck_should_fail m = not <$> git_annex "fsck" []
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
@? "fsck failed to fail with " ++ m
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_migrate = test_migrate' False
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate_via_gitattributes :: Assertion
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
test_migrate_via_gitattributes = test_migrate' True
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_migrate' :: Bool -> Assertion
test_migrate' usegitattributes = intmpclonerepoInDirect $ do
where indenting
2012-11-11 04:51:07 +00:00
annexed_notpresent annexedfile
annexed_notpresent sha1annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "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"
where indenting
2012-11-11 04:51:07 +00:00
annexed_present annexedfile
annexed_present sha1annexedfile
if usegitattributes
then do
more hlint
2014-02-11 05:35:11 +00:00
writeFile ".gitattributes" "* annex.backend=SHA1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [sha1annexedfile]
where indenting
2012-11-11 04:51:07 +00:00
@? "migrate sha1annexedfile failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [annexedfile]
where indenting
2012-11-11 04:51:07 +00:00
@? "migrate annexedfile failed"
else do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [sha1annexedfile, "--backend", "SHA1"]
where indenting
2012-11-11 04:51:07 +00:00
@? "migrate sha1annexedfile failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [annexedfile, "--backend", "SHA1"]
where indenting
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
more hlint
2014-02-11 05:35:11 +00:00
writeFile ".gitattributes" "* annex.backend=SHA256"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [sha1annexedfile]
where indenting
2012-11-11 04:51:07 +00:00
@? "migrate sha1annexedfile failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "migrate" [annexedfile]
where indenting
2012-11-11 04:51:07 +00:00
@? "migrate annexedfile failed"
annexed_present annexedfile
annexed_present sha1annexedfile
checkbackend annexedfile backendSHA256
checkbackend sha1annexedfile backendSHA256
test migrate; 75%
2011-01-12 01:11:32 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unused :: Assertion
disable unused test in direct mode This test is actually pointing at a problem, with getKeysPresent in direct mode. When a file is git rm -f'd, this removes its content, but it's still listed by getKeysPresent. However, unused is fairly useless in direct mode, and the test needs to be updated to handle other differences, so disable it for now
2013-05-17 19:16:28 +00:00
-- This test is broken in direct mode
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_unused = intmpclonerepoInDirect $ do
set annex.largefiles earlier in test suite The ingitfile was having git run it through the clean filter in some cases.
2015-12-30 17:29:00 +00:00
checkunused [] "in new clone"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
git_annex "get" [sha1annexedfile] @? "get of file failed"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
annexedfilekey <- getKey backendSHA256E annexedfile
sha1annexedfilekey <- getKey backendSHA1 sha1annexedfile
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after get"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "rm", Param "-fq", File annexedfile] @? "git rm failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after rm"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "foo"] @? "git commit failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after commit"
update test suite for smarter unused
2011-09-28 21:48:11 +00:00
-- unused checks origin/master; once it's gone it is really unused
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "git remote rm origin failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [annexedfilekey] "after origin branches are gone"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "rm", Param "-fq", File sha1annexedfile] @? "git rm failed"
boolSystem "git" [Param "commit", Param "-q", Param "-m", Param "foo"] @? "git commit failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [annexedfilekey, sha1annexedfilekey] "after rm sha1annexedfile"
test unused et al
2011-01-12 05:58:23 +00:00
-- good opportunity to test dropkey also
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "dropkey" ["--force", Types.Key.key2file annexedfilekey]
test unused et al
2011-01-12 05:58:23 +00:00
@? "dropkey failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [sha1annexedfilekey] ("after dropkey --force " ++ Types.Key.key2file annexedfilekey)
test unused et al
2011-01-12 05:58:23 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "dropunused" ["1"] @? "dropunused failed to fail without --force"
git_annex "dropunused" ["--force", "1"] @? "dropunused failed"
fix breakage caught by test suite Can't use show-ref --tags --branches, as that omits remote branches. Instead, filter out the synced refs directly.
2012-09-21 04:49:48 +00:00
checkunused [] "after dropunused"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "dropunused" ["--force", "10", "501"] @? "dropunused failed to fail on bogus numbers"
test unused et al
2011-01-12 05:58:23 +00:00
fix failing git-annex unused test case in v6 WorkTree.lookupFile was finding a key for a file that's deleted from the work tree, which is different than the v5 behavior (though perhaps the same as the direct mode behavior). Fix by checking that the work tree file exists before catting its key. Hopefully this won't slow down much, probably the catKey is much more expensive. I can't see any way to optimise this, except perhaps to make Command.Unused check if work tree files exist before/after calling lookupFile. But, it seems better to make lookupFile really only find keys for worktree files; that's what it's intended to do.
2015-12-30 18:23:31 +00:00
-- unused used to miss renamed symlinks that were not staged
-- and pointed at annexed content, and think that content was unused
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
writeFile "unusedfile" "unusedcontent"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
unusedfilekey <- getKey backendSHA256E "unusedfile"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
renameFile "unusedfile" "unusedunstagedfile"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "rm", Param "-qf", File "unusedfile"] @? "git rm failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkunused [] "with unstaged link"
removeFile "unusedunstagedfile"
fix failing git-annex unused test case in v6 WorkTree.lookupFile was finding a key for a file that's deleted from the work tree, which is different than the v5 behavior (though perhaps the same as the direct mode behavior). Fix by checking that the work tree file exists before catting its key. Hopefully this won't slow down much, probably the catKey is much more expensive. I can't see any way to optimise this, except perhaps to make Command.Unused check if work tree files exist before/after calling lookupFile. But, it seems better to make lookupFile really only find keys for worktree files; that's what it's intended to do.
2015-12-30 18:23:31 +00:00
checkunused [unusedfilekey] "with renamed link deleted"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
-- unused used to miss symlinks that were deleted or modified
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
-- manually
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
writeFile "unusedfile" "unusedcontent"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
boolSystem "git" [Param "add", File "unusedfile"] @? "git add failed"
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
unusedfilekey' <- getKey backendSHA256E "unusedfile"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkunused [] "with staged deleted link"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "rm", Param "-qf", File "unusedfile"] @? "git rm failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkunused [unusedfilekey'] "with staged link deleted"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
-- unused used to false positive on symlinks that were
-- deleted or modified manually, but not staged as such
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
writeFile "unusedfile" "unusedcontent"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" ["unusedfile"] @? "add of unusedfile failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
boolSystem "git" [Param "add", File "unusedfile"] @? "git add failed"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
checkunused [] "with staged file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
removeFile "unusedfile"
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
2016-01-06 20:30:49 +00:00
checkunused [] "with staged deleted file"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
-- When an unlocked file is modified, git diff will cause git-annex
-- to add its content to the repository. Make sure that's not
-- found as unused.
whenM (unlockedFiles <$> getTestMode) $ do
let f = "unlockedfile"
writeFile f "unlockedcontent1"
boolSystem "git" [Param "add", File "unlockedfile"] @? "git add failed"
checkunused [] "with unlocked file before modification"
writeFile f "unlockedcontent2"
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"
where indenting
2012-11-11 04:51:07 +00:00
where
checkunused expectedkeys desc = do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unused" [] @? "unused failed"
add timestamps to unused log files This will be used in expiring old unused objects. The timestamp is when it was first noticed it was unused. Backwards compatability: It supports reading old format unused log files. The old version of git-annex will ignore lines in log files written by the new version, so the worst interop problem would be git annex dropunused not knowing some numbers that git-annex unused reported.
2014-01-22 19:33:02 +00:00
unusedmap <- annexeval $ Logs.Unused.readUnusedMap ""
where indenting
2012-11-11 04:51:07 +00:00
let unusedkeys = M.elems unusedmap
assertEqual ("unused keys differ " ++ desc)
(sort expectedkeys) (sort unusedkeys)
test unused et al
2011-01-12 05:58:23 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_describe :: Assertion
test_describe = intmpclonerepo $ do
git_annex "describe" [".", "this repo"] @? "describe 1 failed"
git_annex "describe" ["origin", "origin repo"] @? "describe 2 failed"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_find :: Assertion
test_find = intmpclonerepo $ do
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" [] []
git_annex "get" [annexedfile] @? "get failed"
test coverage improvements
2011-12-21 06:32:40 +00:00
annexed_present annexedfile
annexed_notpresent sha1annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" [] [annexedfile]
git_annex_expectoutput "find" ["--exclude", annexedfile, "--and", "--exclude", sha1annexedfile] []
git_annex_expectoutput "find" ["--include", annexedfile] [annexedfile]
git_annex_expectoutput "find" ["--not", "--in", "origin"] []
git_annex_expectoutput "find" ["--copies", "1", "--and", "--not", "--copies", "2"] [sha1annexedfile]
git_annex_expectoutput "find" ["--inbackend", "SHA1"] [sha1annexedfile]
git_annex_expectoutput "find" ["--inbackend", "WORM"] []
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
fix * glob matching files in subdirectories
2013-02-26 17:49:22 +00:00
{- --include=* should match files in subdirectories too,
- and --exclude=* should exclude them. -}
createDirectory "dir"
writeFile "dir/subfile" "subfile"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" ["dir"] @? "add of subdir failed"
git_annex_expectoutput "find" ["--include", "*", "--exclude", annexedfile, "--exclude", sha1annexedfile] ["dir/subfile"]
git_annex_expectoutput "find" ["--exclude", "*"] []
fix * glob matching files in subdirectories
2013-02-26 17:49:22 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_merge :: Assertion
test_merge = intmpclonerepo $
git_annex "merge" [] @? "merge failed"
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_info :: Assertion
test_info = intmpclonerepo $ do
json <- git_annex_output "info" ["--json"]
Stop depending on testpack.
2013-02-28 03:21:43 +00:00
case Text.JSON.decodeStrict json :: Text.JSON.Result (Text.JSON.JSObject Text.JSON.JSValue) of
Text.JSON.Ok _ -> return ()
Text.JSON.Error e -> assertFailure e
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_version :: Assertion
test_version = intmpclonerepo $
git_annex "version" [] @? "version failed"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_sync :: Assertion
test_sync = intmpclonerepo $ do
git_annex "sync" [] @? "sync failed"
regression test for 7b0970b340d7faeb745c666146c7f701ec71808f
2013-07-30 21:03:50 +00:00
{- Regression test for bug fixed in
- 7b0970b340d7faeb745c666146c7f701ec71808f, where in direct mode
- sync committed the symlink standin file to the annex. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--in", "."] []
add basic tests for some of the newer commands For most this just makes sure they run successfully, and improves test coverage statistics; it's hard to test the output of eg, find and status.
2011-12-20 20:26:39 +00:00
add a test case for merge conflict automatic resolution
2013-05-20 19:51:40 +00:00
{- Regression test for union merge bug fixed in
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
- 0214e0fb175a608a49b812d81b4632c081f63027 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_union_merge_regression :: Assertion
test_union_merge_regression =
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
{- We need 3 repos to see this bug. -}
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
withtmpclonerepo $ \r3 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2, r3] $ \r -> indir r $ do
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r1) $
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "add", Param "r1", File ("../../" ++ r1)] @? "remote add"
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r2) $
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "add", Param "r2", File ("../../" ++ r2)] @? "remote add"
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
when (r /= r3) $
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "add", Param "r3", File ("../../" ++ r3)] @? "remote add"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get failed"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "remote rm"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r3, r2, r1] $ \r -> indir r $
git_annex "sync" [] @? "sync failed"
forM_ [r3, r2] $ \r -> indir r $
git_annex "drop" ["--force", annexedfile] @? "drop failed"
indir r1 $ do
git_annex "sync" [] @? "sync failed in r1"
git_annex_expectoutput "find" ["--in", "r3"] []
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
{- This was the bug. The sync
- mangled location log data and it
- thought the file was still in r2 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--in", "r2"] []
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
add a test case for merge conflict automatic resolution
2013-05-20 19:51:40 +00:00
{- Regression test for the automatic conflict resolution bug fixed
- in f4ba19f2b8a76a1676da7bb5850baa40d9c388e2. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution_movein_regression :: Assertion
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
test_conflict_resolution_movein_regression = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
let rname r = if r == r1 then "r1" else "r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Get all files, see check below. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [] @? "get failed"
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Set up a conflict. -}
let newcontent = content annexedfile ++ rname r
ifM (annexeval Config.isDirect)
( writeFile annexedfile newcontent
, do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unlock" [annexedfile] @? "unlock failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
writeFile annexedfile newcontent
)
{- Sync twice in r1 so it gets the conflict resolution
- update from r2 -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2, r1] $ \r -> indir r $
git_annex "sync" ["--force"] @? "sync failed in " ++ rname r
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- After the sync, it should be possible to get all
- files. This includes both sides of the conflict,
- although the filenames are not easily predictable.
-
- The bug caused, in direct mode, one repo to
- be missing the content of the file that had
- been put in it. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ [r1, r2] $ \r -> indir r $ do
git_annex "get" [] @? "unable to get all files after merge conflict resolution in " ++ rname r
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
more conflict resolution tests
2014-03-05 03:12:15 +00:00
{- Simple case of conflict resolution; 2 different versions of annexed
- file. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution :: Assertion
test_conflict_resolution =
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
more conflict resolution tests
2014-03-05 03:12:15 +00:00
disconnectOrigin
writeFile conflictor "conflictor1"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ do
more conflict resolution tests
2014-03-05 03:12:15 +00:00
disconnectOrigin
writeFile conflictor "conflictor2"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r2"
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
git_annex "sync" [] @? "sync failed"
more conflict resolution tests
2014-03-05 03:12:15 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
where
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
length v == 2
@? (what ++ " not exactly 2 variant files in: " ++ show l)
Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. I think this is a git behavior change, but have not checked to be sure. Conflict cruft used to look like $foo~HEAD, but now just $foo is left behind as conflict cruft. With test case.
2014-07-11 20:56:19 +00:00
conflictor `notElem` l @? ("conflictor still present after conflict resolution")
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir d $ do
git_annex "get" v @? "get failed"
git_annex_expectoutput "find" v v
more conflict resolution tests
2014-03-05 03:12:15 +00:00
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
{- Check merge conflict resolution when one side is an annexed
- file, and the other is a directory. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_mixed_conflict_resolution :: Assertion
test_mixed_conflict_resolution = do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
check True
check False
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
writeFile conflictor "conflictor"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ do
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
createDirectory conflictor
improved test for FAT symlink regressions The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
2014-03-04 17:23:47 +00:00
writeFile subfile "subfile"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r2"
pair r1 r2
fix broken test 1c997fd08c04b27c9acb561a33c6fb2829089be7 broke the mixed conflict resolution test. Since origin is no longer involved, both sides have to sync after pairing. (The sync before pairing is just to get a commit.)
2014-02-03 18:32:07 +00:00
let l = if inr1 then [r1, r2] else [r2, r1]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $
git_annex "sync" [] @? "sync failed in mixed conflict"
fix broken test 1c997fd08c04b27c9acb561a33c6fb2829089be7 broke the mixed conflict resolution test. Since origin is no longer involved, both sides have to sync after pairing. (The sync before pairing is just to get a commit.)
2014-02-03 18:32:07 +00:00
checkmerge "r1" r1
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
checkmerge "r2" r2
narrowing test case
2014-02-04 19:14:16 +00:00
conflictor = "conflictor"
improved test for FAT symlink regressions The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
2014-03-04 17:23:47 +00:00
subfile = conflictor </> "subfile"
narrowing test case
2014-02-04 19:14:16 +00:00
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing")
l <- getDirectoryContents d
improved test for FAT symlink regressions The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
2014-03-04 17:23:47 +00:00
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
more conflict resolution tests
2014-03-05 03:12:15 +00:00
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir d $ do
git_annex "get" (conflictor:v) @? ("get failed in " ++ what)
git_annex_expectoutput "find" [conflictor] [Git.FilePath.toInternalGitPath subfile]
git_annex_expectoutput "find" v v
narrowing test case
2014-02-04 19:14:16 +00:00
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
{- Check merge conflict resolution when both repos start with an annexed
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
- file; one modifies it, and the other deletes it. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_remove_conflict_resolution :: Assertion
test_remove_conflict_resolution = do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
check True
check False
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
disconnectOrigin
writeFile conflictor "conflictor"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
disconnectOrigin
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
indir r2 $ do
git_annex "sync" [] @? "sync failed in r2"
git_annex "get" [conflictor]
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
@? "get conflictor failed"
unlessM (annexeval Config.isDirect) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "unlock" [conflictor]
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
@? "unlock conflictor failed"
writeFile conflictor "newconflictor"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
nukeFile conflictor
let l = if inr1 then [r1, r2, r1] else [r2, r1, r2]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $
git_annex "sync" [] @? "sync failed"
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
checkmerge "r1" r1
checkmerge "r2" r2
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
more conflict resolution tests
2014-03-05 03:12:15 +00:00
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 21:12:26 +00:00
indent with tabs not spaces Found these with: git grep "^ " $(find -type f -name \*.hs) |grep -v ': where' Unfortunately there is some inline hamlet that cannot use tabs for indentation. Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm leaving it as-is.
2014-10-09 19:09:26 +00:00
{- Check merge confalict resolution when a file is annexed in one repo,
- and checked directly into git in the other repo.
-
- This test requires indirect mode to set it up, but tests both direct and
- indirect mode.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_nonannexed_file_conflict_resolution :: Assertion
test_nonannexed_file_conflict_resolution = do
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
check True False
check False False
move check for if direct mode is supported to the right place Need to run that check inside a annex repo.
2015-12-29 21:48:25 +00:00
check True True
check False True
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 switchdirect = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
whenM (isInDirect r1 <&&> isInDirect r2) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
disconnectOrigin
writeFile conflictor "conflictor"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ do
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
disconnectOrigin
writeFile conflictor nonannexed_content
test suite 100% pass in v6, finally! Set annex.largefiles when adding the conflicting non-annexed file, otherwise it would be added as an annexed file.
2015-12-30 19:12:27 +00:00
boolSystem "git"
[ Param "config"
, Param "annex.largefiles"
, Param ("exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor)
] @? "git config annex.largefiles failed"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r2"
pair r1 r2
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
let l = if inr1 then [r1, r2] else [r2, r1]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $ do
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
when switchdirect $
move check for if direct mode is supported to the right place Need to run that check inside a annex repo.
2015-12-29 21:48:25 +00:00
whenM (annexeval Annex.Version.versionSupportsDirectMode) $
git_annex "direct" [] @? "failed switching to direct mode"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed"
sync: Automatically resolve merge conflict between and annexed file and a regular git file. This is a new feature, it was not handled before, since it's a bit of an edge case. However, it can be handled exactly the same as a file/dir conflict, just leave the non-annexed item alone. While implementing this, the core resolveMerge' function got a lot simpler and clearer. Note especially that where before there was an asymetric call to stagefromdirectmergedir, now graftin is called symmetrically in both cases. And, in order to add that `graftin us`, the current branch needed to be known (if there is no current branch, there cannot be a merge conflict). This led to some cleanups of how autoMergeFrom behaved when there is no current branch. This commit was sponsored by Philippe Gauthier.
2014-03-04 21:45:11 +00:00
checkmerge ("r1" ++ show switchdirect) r1
checkmerge ("r2" ++ show switchdirect) r2
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
conflictor = "conflictor"
nonannexed_content = "nonannexed"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
@? (what ++ " conflictor variant file missing in: " ++ show l )
more conflict resolution tests
2014-03-05 03:12:15 +00:00
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
sync: Automatically resolve merge conflict between and annexed file and a regular git file. This is a new feature, it was not handled before, since it's a bit of an edge case. However, it can be handled exactly the same as a file/dir conflict, just leave the non-annexed item alone. While implementing this, the core resolveMerge' function got a lot simpler and clearer. Note especially that where before there was an asymetric call to stagefromdirectmergedir, now graftin is called symmetrically in both cases. And, in order to add that `graftin us`, the current branch needed to be known (if there is no current branch, there cannot be a merge conflict). This led to some cleanups of how autoMergeFrom behaved when there is no current branch. This commit was sponsored by Philippe Gauthier.
2014-03-04 21:45:11 +00:00
s <- catchMaybeIO (readFile (d </> conflictor))
s == Just nonannexed_content
@? (what ++ " wrong content for nonannexed file: " ++ show s)
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
{- Check merge confalict resolution when a file is annexed in one repo,
- and is a non-git-annex symlink in the other repo.
-
- Test can only run when coreSymlinks is supported, because git needs to
- be able to check out the non-git-annex symlink.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_nonannexed_symlink_conflict_resolution :: Assertion
test_nonannexed_symlink_conflict_resolution = do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
check True False
check False False
move check for if direct mode is supported to the right place Need to run that check inside a annex repo.
2015-12-29 21:48:25 +00:00
check True True
check False True
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check inr1 switchdirect = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
whenM (checkRepo (Types.coreSymlinks <$> Annex.getGitConfig) r1
<&&> isInDirect r1 <&&> isInDirect r2) $ do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
disconnectOrigin
writeFile conflictor "conflictor"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add conflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
disconnectOrigin
createSymbolicLink symlinktarget "conflictor"
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r2"
pair r1 r2
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
let l = if inr1 then [r1, r2] else [r2, r1]
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
forM_ l $ \r -> indir r $ do
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
when switchdirect $
move check for if direct mode is supported to the right place Need to run that check inside a annex repo.
2015-12-29 21:48:25 +00:00
whenM (annexeval Annex.Version.versionSupportsDirectMode) $ do
git_annex "direct" [] @? "failed switching to direct mode"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed"
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
checkmerge ("r1" ++ show switchdirect) r1
checkmerge ("r2" ++ show switchdirect) r2
conflictor = "conflictor"
symlinktarget = "dummy-target"
variantprefix = conflictor ++ ".variant"
checkmerge what d = do
l <- getDirectoryContents d
let v = filter (variantprefix `isPrefixOf`) l
not (null v)
@? (what ++ " conflictor variant file missing in: " ++ show l )
length v == 1
@? (what ++ " too many variant files in: " ++ show v)
conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
s <- catchMaybeIO (readSymbolicLink (d </> conflictor))
s == Just symlinktarget
@? (what ++ " wrong target for nonannexed symlink: " ++ show s)
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
{- Check merge conflict resolution when there is a local file,
- that is not staged or committed, that conflicts with what's being added
- from the remmote.
-
- Case 1: Remote adds file named conflictor; local has a file named
- conflictor.
-
- Case 2: Remote adds conflictor/file; local has a file named conflictor.
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uncommitted_conflict_resolution :: Assertion
test_uncommitted_conflict_resolution = do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
check conflictor
check (conflictor </> "file")
where
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
check remoteconflictor = withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
disconnectOrigin
revert parentDir change Reverts 965e106f242b34a8269c72e136f60fc0c36ae460 Unfortunately, this caused breakage on Windows, and possibly elsewhere, because parentDir and takeDirectory do not behave the same when there is a trailing directory separator.
2015-01-09 17:11:56 +00:00
createDirectoryIfMissing True (parentDir remoteconflictor)
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
writeFile remoteconflictor annexedcontent
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex conflictor @? "add remoteconflicter failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ do
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
disconnectOrigin
writeFile conflictor localcontent
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair r1 r2
indir r2 $ ifM (annexeval Config.isDirect)
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
( do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed"
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
let local = conflictor ++ localprefix
doesFileExist local @? (local ++ " missing after merge")
s <- readFile local
s == localcontent @? (local ++ " has wrong content: " ++ s)
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [conflictor] @? "get failed"
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
doesFileExist remoteconflictor @? (remoteconflictor ++ " missing after merge")
s' <- readFile remoteconflictor
s' == annexedcontent @? (remoteconflictor ++ " has wrong content: " ++ s)
-- this case is intentionally not handled
-- in indirect mode, since the user
-- can recover on their own easily
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
, not <$> git_annex "sync" [] @? "sync failed to fail"
add test cases for the new direct mode merge bug
2014-03-04 05:41:00 +00:00
)
conflictor = "conflictor"
localprefix = ".variant-local"
localcontent = "local"
annexedcontent = "annexed"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
{- On Windows/FAT, repeated conflict resolution sometimes
- lost track of whether a file was a symlink.
add test case & fix conflict resolution bug on Windows & FAT Fix bug in automatic merge conflict resolution code when used on a filesystem not supporting symlinks, which resulted in it losing track of the symlink bit of annexed files. This was the underlying bug that was causing another test to fail, which got worked around in 1c997fd08c04b27c9acb561a33c6fb2829089be7. I've chosen to keep 2 separate test cases since the old test case only detected the problem accidentially. Test suite passes on FAT & in windows, as well as on proper unix systems. This commit was sponsored by Ellis Whitehead.
2014-02-04 19:31:53 +00:00
-}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_conflict_resolution_symlink_bit :: Assertion
test_conflict_resolution_symlink_bit =
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo $ \r1 ->
withtmpclonerepo $ \r2 ->
withtmpclonerepo $ \r3 -> do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r1 $ do
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
writeFile conflictor "conflictor"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [conflictor] @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r1"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link conflictor "r1"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r2 $ do
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
createDirectory conflictor
writeFile (conflictor </> "subfile") "subfile"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [conflictor] @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r2"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link (conflictor </> "subfile") "r2"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir r3 $ do
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
writeFile conflictor "conflictor"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [conflictor] @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r1"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link (conflictor </> "subfile") "r3"
where
narrowing test case
2014-02-04 19:14:16 +00:00
conflictor = "conflictor"
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
check_is_link f what = do
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput "find" ["--include=*", f] [Git.FilePath.toInternalGitPath f]
much improved test and real fix for FAT symlink loss on conflicted merge I think that 751f496c11b421f498d19d4ea939bfd84125d349 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
2014-03-04 18:31:26 +00:00
l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles Git.Ref.headRef [f]
all (\i -> Git.Types.toBlobType (Git.LsTree.mode i) == Just Git.Types.SymlinkBlob) l
@? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l)
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 20:36:39 +00:00
{- A v6 unlocked file that conflicts with a locked file should be resolved
- 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
indir r1 $ whenM shouldtest $ do
disconnectOrigin
writeFile conflictor "conflictor"
git_annex "add" [conflictor] @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r1"
indir r2 $ whenM shouldtest $ do
disconnectOrigin
writeFile conflictor "conflictor"
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
shouldtest = annexeval Annex.Version.versionSupportsUnlockedPointers
conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge what d = indir d $ whenM shouldtest $ do
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
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
{- Set up repos as remotes of each other. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
pair :: FilePath -> FilePath -> Assertion
pair r1 r2 = forM_ [r1, r2] $ \r -> indir r $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
when (r /= r1) $
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "add", Param "r1", File ("../../" ++ r1)] @? "remote add"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
when (r /= r2) $
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "remote", Param "add", Param "r2", File ("../../" ++ r2)] @? "remote add"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_map :: Assertion
test_map = intmpclonerepo $ do
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
-- set descriptions, that will be looked for in the map
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "describe" [".", "this repo"] @? "describe 1 failed"
git_annex "describe" ["origin", "origin repo"] @? "describe 2 failed"
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
-- --fast avoids it running graphviz, not a build dependency
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "map" ["--fast"] @? "map failed"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uninit :: Assertion
test_uninit = intmpclonerepo $ do
git_annex "get" [] @? "get failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
_ <- git_annex "uninit" [] -- exit status not checked; does abnormal exit
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkregularfile annexedfile
doesDirectoryExist ".git" @? ".git vanished in uninit"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_uninit_inbranch :: Assertion
test_uninit_inbranch = intmpclonerepoInDirect $ do
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "checkout", Param "git-annex"] @? "git checkout git-annex"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "uninit" [] @? "uninit failed to fail when git-annex branch was checked out"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_upgrade :: Assertion
test_upgrade = intmpclonerepo $
git_annex "upgrade" [] @? "upgrade from same version failed"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_whereis :: Assertion
test_whereis = intmpclonerepo $ do
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "whereis" [annexedfile] @? "whereis on non-present file failed"
git_annex "untrust" ["origin"] @? "untrust failed"
not <$> git_annex "whereis" [annexedfile] @? "whereis on non-present file only present in untrusted repo failed to fail"
git_annex "get" [annexedfile] @? "get failed"
Test suite improvements. Current top-level test coverage: 68% Been higher before, but a lot of new code has been added.
2011-12-20 21:31:25 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "whereis" [annexedfile] @? "whereis on present file failed"
map: --fast disables use of dot to display map Generally useful, and allows the test suite to test it.
2011-12-20 20:31:59 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_hook_remote :: Assertion
test_hook_remote = intmpclonerepo $ do
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "initremote" (words "foo type=hook encryption=none hooktype=foo") @? "initremote failed"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
createDirectory dir
git_config "annex.foo-store-hook" $
"cp $ANNEX_FILE " ++ loc
git_config "annex.foo-retrieve-hook" $
"cp " ++ loc ++ " $ANNEX_FILE"
git_config "annex.foo-remove-hook" $
"rm -f " ++ loc
git_config "annex.foo-checkpresent-hook" $
"if [ -e " ++ loc ++ " ]; then echo $ANNEX_KEY; fi"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to hook remote failed"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from hook remote failed"
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
where indenting
2012-11-11 04:51:07 +00:00
where
dir = "dir"
loc = dir ++ "/$ANNEX_KEY"
git_config k v = boolSystem "git" [Param "config", Param k, Param v]
@? "git config failed"
Windows: The test suite now passes on Windows (a few broken parts are disabled). Better to have a working test suite that doesn't test a few things than no working test suite. Most of the disabled stuff is because for some reason "git annex sync" doesn't work when run inside the test suite. Looks like PATH problems. The directory and rsync special remotes seem broken on Windows, or maybe the tests are. Pretty sure the hook special remote test is broken.
2013-06-18 20:12:43 +00:00
#else
-- this test doesn't work in Windows TODO
noop
#endif
added a test of the hook special remote
2011-12-20 19:13:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_directory_remote :: Assertion
test_directory_remote = intmpclonerepo $ do
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
createDirectory "dir"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "initremote" (words "foo type=directory encryption=none directory=dir") @? "initremote failed"
git_annex "get" [annexedfile] @? "get of file failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to directory remote failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from directory remote failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_rsync_remote :: Assertion
test_rsync_remote = intmpclonerepo $ do
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
createDirectory "dir"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "initremote" (words "foo type=rsync encryption=none rsyncurl=dir") @? "initremote failed"
git_annex "get" [annexedfile] @? "get of file failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to rsync remote failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from rsync remote failed"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
add tests of directory and rsync special remotes
2011-12-20 19:17:56 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_bup_remote :: Assertion
test_bup_remote = intmpclonerepo $ when Build.SysConfig.bup $ do
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
dir <- absPath "dir" -- bup special remote needs an absolute path
createDirectory dir
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "initremote" (words $ "foo type=bup encryption=none buprepo="++dir) @? "initremote failed"
git_annex "get" [annexedfile] @? "get of file failed"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to bup remote failed"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--from", "foo"] @? "copy --from bup remote failed"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from bup remote failed"
test bup special remote (74% coverage)
2011-12-21 17:50:33 +00:00
annexed_present annexedfile
improve
2011-12-21 18:10:36 +00:00
-- gpg is not a build dependency, so only test when it's available
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_crypto :: Assertion
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_crypto = do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
testscheme "shared"
testscheme "hybrid"
testscheme "pubkey"
where
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
gpgcmd = Utility.Gpg.mkGpgCmd Nothing
testscheme scheme = intmpclonerepo $ whenM (Utility.Path.inPath (Utility.Gpg.unGpgCmd gpgcmd)) $ do
Utility.Gpg.testTestHarness gpgcmd
@? "test harness self-test failed"
Utility.Gpg.testHarness gpgcmd $ do
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
createDirectory "dir"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
let a cmd = git_annex cmd $
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
[ "foo"
, "type=directory"
, "encryption=" ++ scheme
, "directory=dir"
, "highRandomQuality=false"
] ++ if scheme `elem` ["hybrid","pubkey"]
then ["keyid=" ++ Utility.Gpg.testKeyId]
else []
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"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "get" [annexedfile] @? "get of file failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "copy" [annexedfile, "--to", "foo"] @? "copy --to encrypted remote failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
(c,k) <- annexeval $ do
uuid <- Remote.nameToUUID "foo"
rs <- Logs.Remote.readRemoteLog
reorg
2015-12-15 19:34:28 +00:00
Just k <- Annex.WorkTree.lookupFile annexedfile
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
return (fromJust $ M.lookup uuid rs, k)
let key = if scheme `elem` ["hybrid","pubkey"]
then Just $ Utility.Gpg.KeyIds [Utility.Gpg.testKeyId]
else Nothing
testEncryptedRemote scheme key c [k] @? "invalid crypto setup"
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_notpresent annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "move" [annexedfile, "--from", "foo"] @? "move --from encrypted remote failed"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
not <$> git_annex "drop" [annexedfile, "--numcopies=2"] @? "drop failed to fail"
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
annexed_present annexedfile
{- Ensure the configuration complies with the encryption scheme, and
- that all keys are encrypted properly for the given directory remote. -}
testEncryptedRemote scheme ks c keys = case Remote.Helper.Encryptable.extractCipher c of
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
keysMatch (Utility.Gpg.KeyIds ks') =
maybe False (\(Utility.Gpg.KeyIds ks2) ->
sort (nub ks2) == sort (nub ks')) ks
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
checkCipher encipher = Utility.Gpg.checkEncryptionStream gpgcmd encipher . Just
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
checkScheme Types.Crypto.Hybrid = scheme == "hybrid"
checkScheme Types.Crypto.PubKey = scheme == "pubkey"
checkKeys cip mvariant = do
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
cipher <- Crypto.decryptCipher gpgcmd cip
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
files <- filterM doesFileExist $
map ("dir" </>) $ concatMap (key2files cipher) keys
return (not $ null files) <&&> allM (checkFile mvariant) files
checkFile mvariant filename =
support gpg.program When gpg.program is configured, it's used to get the command to run for gpg. Useful on systems that have only a gpg2 command or want to use it instead of the gpg command.
2015-09-09 22:06:49 +00:00
Utility.Gpg.checkEncryptionFile gpgcmd filename $
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
if mvariant == Just Types.Crypto.PubKey then ks else Nothing
remove 163 lines of code without changing anything except imports
2016-01-20 20:36:33 +00:00
key2files cipher = Annex.Locations.keyPaths .
finished converting test suite for tasty Also merged in Test.hs from master.
2013-11-14 21:03:49 +00:00
Crypto.encryptKey Types.Crypto.HmacSha1 cipher
can't test gpg on Windows yet
2013-05-17 20:49:34 +00:00
#else
fix windows build
2014-12-30 21:02:51 +00:00
test_crypto = putStrLn "gpg testing not implemented on Windows"
can't test gpg on Windows yet
2013-05-17 20:49:34 +00:00
#endif
test encrypted special remote This involved adding a test harness to run gpg with a dummy key, and lots of fun.
2011-12-21 03:20:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
test_add_subdirs :: Assertion
test_add_subdirs = intmpclonerepo $ do
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
createDirectory "dir"
writeFile ("dir" </> "foo") $ "dir/" ++ content annexedfile
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" ["dir"] @? "add of subdir failed"
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
{- Regression test for Windows bug where symlinks were not
- calculated correctly for files in subdirs. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "sync" [] @? "sync failed"
Windows: Fix some filename encoding bugs. http://git-annex.branchable.com/bugs/Unicode_file_names_ignored_on_Windows/ Not a complete fix yet.
2014-03-19 18:49:01 +00:00
l <- annexeval $ decodeBS <$> Annex.CatFile.catObject (Git.Types.Ref "HEAD:dir/foo")
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
"../.git/annex/" `isPrefixOf` l @? ("symlink from subdir to .git/annex is wrong: " ++ l)
createDirectory "dir2"
writeFile ("dir2" </> "foo") $ content annexedfile
setCurrentDirectory "dir"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex "add" [".." </> "dir2"] @? "add of ../subdir failed"
add regression test for symlink calculation Note: Test reordered because running git-annex sync early broke the environment for some other tests.
2014-02-07 00:33:30 +00:00
test case for addurl file://
2015-02-10 19:20:07 +00:00
test_addurl :: Assertion
test_addurl = intmpclonerepo $ do
-- file:// only; this test suite should not hit the network
f <- absPath "myurl"
dropdrive drops the leading slash, so need fil:///
2015-02-11 16:22:43 +00:00
let url = replace "\\" "/" ("file:///" ++ dropDrive f)
test case for addurl file://
2015-02-10 19:20:07 +00:00
writeFile f "foo"
fix file:// url generation on windows in test
2015-02-11 16:21:33 +00:00
git_annex "addurl" [url] @? ("addurl failed on " ++ url)
test case for addurl file://
2015-02-10 19:20:07 +00:00
let dest = "addurlurldest"
fix file:// url generation on windows in test
2015-02-11 16:21:33 +00:00
git_annex "addurl" ["--file", dest, url] @? ("addurl failed on " ++ url ++ " with --file")
test case for addurl file://
2015-02-10 19:20:07 +00:00
doesFileExist dest @? (dest ++ " missing after addurl --file")
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
-- This is equivilant to running git-annex, but it's all run in-process
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
-- so test coverage collection works.
git_annex :: String -> [String] -> IO Bool
git_annex command params = do
more tests
2011-01-07 01:39:26 +00:00
-- catch all errors, including normally fatal errors
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
r <- try run ::IO (Either SomeException ())
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
case r of
Right _ -> return True
Left _ -> return False
where indenting
2012-11-11 04:51:07 +00:00
where
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
run = GitAnnex.run optParser Nothing (command:"-q":params)
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
test coverage improvements
2011-12-21 06:32:40 +00:00
{- Runs git-annex and returns its output. -}
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_output :: String -> [String] -> IO String
git_annex_output command params = do
got <- Utility.Process.readProcess "git-annex" (command:params)
-- Since the above is a separate process, code coverage stats are
test coverage improvements
2011-12-21 06:32:40 +00:00
-- not gathered for things run in it.
test: Fix threaded runtime hang. There was one forkProcess lurking in test.hs, and that seems to be responsible for recent buildd failures on amd64 and armhf. I was able to reproduce it pretty easily on amd64, and even once on i386, and it was clearly that same bad old threaded runtime hang. So removing this forkProcess should fix it. Odd that it lurked for some months before popping up.
2012-10-11 17:45:09 +00:00
-- Run same command again, to get code coverage.
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
_ <- git_annex command params
test coverage improvements
2011-12-21 06:32:40 +00:00
return got
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
git_annex_expectoutput :: String -> [String] -> [String] -> IO ()
git_annex_expectoutput command params expected = do
got <- lines <$> git_annex_output command params
test coverage improvements
2011-12-21 06:32:40 +00:00
got == expected @? ("unexpected value running " ++ command ++ " " ++ show params ++ " -- got: " ++ show got ++ " expected: " ++ show expected)
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
-- Runs an action in the current annex. Note that shutdown actions
-- are not run; this should only be used for actions that query state.
successfully split Annex and AnnexState out of TypeInternals
2011-01-26 01:49:04 +00:00
annexeval :: Types.Annex a -> IO a
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
annexeval a = do
Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR. The environment needs to override git-config. Changed when git config is read, and avoid rereading it once it's been read. chdir for both worktree settings.
2012-05-18 22:20:53 +00:00
s <- Annex.new =<< Git.CurrentRepo.get
fix test suite build
2012-04-30 17:59:05 +00:00
Annex.eval s $ do
Annex.setOutput Types.Messages.QuietOutput
a
add tests for trust/untrust
2011-01-11 22:50:18 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
innewrepo :: Assertion -> Assertion
innewrepo a = withgitrepo $ \r -> indir r a
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
inmainrepo :: Assertion -> Assertion
inmainrepo = indir mainrepodir
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
intmpclonerepo :: Assertion -> Assertion
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
intmpclonerepo a = withtmpclonerepo $ \r -> indir r a
test fsck in bare repos (75%)
2011-12-21 18:20:41 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
intmpclonerepoInDirect :: Assertion -> Assertion
intmpclonerepoInDirect a = intmpclonerepo $
disable stuff that is not supported in direct mode Also fixed a git rm that failed due to seeing modified file content in direct mode.
2013-05-17 18:52:12 +00:00
ifM isdirect
( putStrLn "not supported in direct mode; skipping"
, a
)
where
fix some mixed space+tab indentation This fixes all instances of " \t" in the code base. Most common case seems to be after a "where" line; probably vim copied the two space layout of that line. Done as a background task while listening to episode 2 of the Type Theory podcast.
2014-10-09 18:53:13 +00:00
isdirect = annexeval $ do
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
Annex.Init.initialize Nothing Nothing
disable stuff that is not supported in direct mode Also fixed a git rm that failed due to seeing modified file content in direct mode.
2013-05-17 18:52:12 +00:00
Config.isDirect
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
checkRepo :: Types.Annex a -> FilePath -> IO a
checkRepo getval d = do
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
s <- Annex.new =<< Git.Construct.fromPath d
add regression test case for ba42b67c70715282fc38953e029f0a172fc00c5d better late than never
2014-07-10 17:34:53 +00:00
Annex.eval s getval
isInDirect :: FilePath -> IO Bool
isInDirect = checkRepo (not <$> Config.isDirect)
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 21:37:36 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
intmpbareclonerepo :: Assertion -> Assertion
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
intmpbareclonerepo a = withtmpclonerepo' (newCloneRepoConfig { bareClone = True } ) $
\r -> indir r a
intmpsharedclonerepo :: Assertion -> Assertion
intmpsharedclonerepo a = withtmpclonerepo' (newCloneRepoConfig { sharedClone = True } ) $
\r -> indir r a
more tests
2011-01-07 02:22:09 +00:00
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
withtmpclonerepo :: (FilePath -> Assertion) -> Assertion
withtmpclonerepo = withtmpclonerepo' newCloneRepoConfig
withtmpclonerepo' :: CloneRepoConfig -> (FilePath -> Assertion) -> Assertion
withtmpclonerepo' cfg a = do
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
dir <- tmprepodir
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
clone <- clonerepo mainrepodir dir cfg
r <- tryNonAsync (a clone)
case r of
defer deletion of test repos until end, fixes sqlite crash The crash turned out to be caused by the sqlite database being deleted out from under sqlite before it was done with it. Since multiple git_annex calls are done in the same process while running the test suite, the DbHandle could linger until GCed, and the test repo, and thus sqlite database be deleted before the workerThread was done.
2016-01-08 20:14:39 +00:00
Right () -> return ()
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
Left e -> do
defer deletion of test repos until end, fixes sqlite crash The crash turned out to be caused by the sqlite database being deleted out from under sqlite before it was done with it. Since multiple git_annex calls are done in the same process while running the test suite, the DbHandle could linger until GCed, and the test repo, and thus sqlite database be deleted before the workerThread was done.
2016-01-08 20:14:39 +00:00
whenM (keepFailures <$> getTestMode) $
putStrLn $ "** Preserving repo for failure analysis in " ++ clone
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
throwM e
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
disconnectOrigin :: Assertion
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
disconnectOrigin = boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "remote rm"
fix test suite to pass on windows On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
2014-02-03 16:03:10 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
withgitrepo :: (FilePath -> Assertion) -> Assertion
withgitrepo = bracket (setuprepo mainrepodir) return
more tests
2011-01-07 01:39:26 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir :: FilePath -> Assertion -> Assertion
indir dir a = do
export CreateProcess fields from Utility.Process update code to avoid cwd and env redefinition warnings
2014-06-10 23:20:14 +00:00
currdir <- getCurrentDirectory
add another test and improve error handling
2011-01-08 19:00:04 +00:00
-- Assertion failures throw non-IO errors; catch
export CreateProcess fields from Utility.Process update code to avoid cwd and env redefinition warnings
2014-06-10 23:20:14 +00:00
-- any type of error and change back to currdir before
add another test and improve error handling
2011-01-08 19:00:04 +00:00
-- rethrowing.
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
r <- bracket_ (changeToTmpDir dir) (setCurrentDirectory currdir)
more hlint
2014-02-11 05:35:11 +00:00
(try a::IO (Either SomeException ()))
add another test and improve error handling
2011-01-08 19:00:04 +00:00
case r of
Right () -> return ()
unify exception handling into Utility.Exception Removed old extensible-exceptions, only needed for very old ghc. Made webdav use Utility.Exception, to work after some changes in DAV's exception handling. Removed Annex.Exception. Mostly this was trivial, but note that tryAnnex is replaced with tryNonAsync and catchAnnex replaced with catchNonAsync. In theory that could be a behavior change, since the former caught all exceptions, and the latter don't catch async exceptions. However, in practice, nothing in the Annex monad uses async exceptions. Grepping for throwTo and killThread only find stuff in the assistant, which does not seem related. Command.Add.undo is changed to accept a SomeException, and things that use it for rollback now catch non-async exceptions, rather than only IOExceptions.
2014-08-08 01:55:44 +00:00
Left e -> throwM e
added some toplevel git-annex subcommand tests note that test coverage doesn't work for those yet
2011-01-07 00:09:49 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
setuprepo :: FilePath -> IO FilePath
setuprepo dir = do
more tests
2011-01-07 01:39:26 +00:00
cleanup dir
ensuretmpdir
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "init", Param "-q", File dir] @? "git init failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
configrepo dir
more tests
2011-01-07 01:39:26 +00:00
return dir
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
data CloneRepoConfig = CloneRepoConfig
{ bareClone :: Bool
, sharedClone :: Bool
}
newCloneRepoConfig :: CloneRepoConfig
newCloneRepoConfig = CloneRepoConfig
{ bareClone = False
, sharedClone = False
}
more tests
2011-01-07 02:22:09 +00:00
-- clones are always done as local clones; we cannot test ssh clones
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
clonerepo :: FilePath -> FilePath -> CloneRepoConfig -> IO FilePath
clonerepo old new cfg = do
more tests
2011-01-07 02:22:09 +00:00
cleanup new
ensuretmpdir
two more breakages introduced when removing the Params constructor
2015-06-03 17:02:33 +00:00
let cloneparams = catMaybes
[ Just $ Param "clone"
, Just $ Param "-q"
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
, if bareClone cfg then Just (Param "--bare") else Nothing
, if sharedClone cfg then Just (Param "--shared") else Nothing
two more breakages introduced when removing the Params constructor
2015-06-03 17:02:33 +00:00
, Just $ File old
, Just $ File new
]
boolSystem "git" cloneparams @? "git clone failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
configrepo new
pass --version to init when needed
2015-12-16 17:14:18 +00:00
indir new $ do
ver <- annexVersion <$> getTestMode
if ver == Annex.Version.defaultVersion
then git_annex "init" ["-q", new] @? "git annex init failed"
else git_annex "init" ["-q", new, "--version", ver] @? "git annex init failed"
init: Fix reversion in detection of repo made with git clone --shared
2015-09-09 17:56:37 +00:00
unless (bareClone cfg) $
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
indir new $
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
setupTestMode
more tests
2011-01-07 02:22:09 +00:00
return new
run the test suite twice, once in direct mode On a filesystem that only supports direct mode, it will test direct mode twice, but oh well.
2013-05-20 18:09:50 +00:00
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
configrepo :: FilePath -> IO ()
configrepo dir = indir dir $ do
support commit.gpgsign Support users who have set commit.gpgsign, by disabling gpg signatures for git-annex branch commits and commits made by the assistant. The thinking here is that a user sets commit.gpgsign intending the commits that they manually initiate to be gpg signed. But not commits made in the background, whether by a deamon or implicitly to the git-annex branch. gpg signing those would be at best a waste of CPU and at worst would fail, or flood the user with gpg passphrase prompts, or put their signature on changes they did not directly do. See Debian bug #753720. Also makes all commits done by git-annex go through a few central control points, to make such changes easier in future. Also disables commit.gpgsign in the test suite. This commit was sponsored by Antoine Boegli.
2014-07-04 15:36:59 +00:00
-- ensure git is set up to let commits happen
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "config", Param "user.name", Param "Test User"] @? "git config failed"
boolSystem "git" [Param "config", Param "user.email", Param "test@example.com"] @? "git config failed"
support commit.gpgsign Support users who have set commit.gpgsign, by disabling gpg signatures for git-annex branch commits and commits made by the assistant. The thinking here is that a user sets commit.gpgsign intending the commits that they manually initiate to be gpg signed. But not commits made in the background, whether by a deamon or implicitly to the git-annex branch. gpg signing those would be at best a waste of CPU and at worst would fail, or flood the user with gpg passphrase prompts, or put their signature on changes they did not directly do. See Debian bug #753720. Also makes all commits done by git-annex go through a few central control points, to make such changes easier in future. Also disables commit.gpgsign in the test suite. This commit was sponsored by Antoine Boegli.
2014-07-04 15:36:59 +00:00
-- avoid signed commits by test suite
remove Params constructor from Utility.SafeCommand This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
2015-06-01 17:52:23 +00:00
boolSystem "git" [Param "config", Param "commit.gpgsign", Param "false"] @? "git config failed"
set annex.largefiles earlier in test suite The ingitfile was having git run it through the clean filter in some cases.
2015-12-30 17:29:00 +00:00
-- tell git-annex to not annex the ingitfile
boolSystem "git"
[ Param "config"
, Param "annex.largefiles"
, Param ("exclude=" ++ ingitfile)
] @? "git config annex.largefiles failed"
set up git email config in clone repos too when running test This fixes the problem of the environment variables apparently not being seen on Windows. I could probably remove the setting of the env vars from Test.hs now as this covers it better. Note that outside the test suite, git-annex on windows seems to manage to configure the repo so commits work on its own.
2014-02-04 18:23:41 +00:00
more tests
2011-01-07 01:39:26 +00:00
ensuretmpdir :: IO ()
ensuretmpdir = do
e <- doesDirectoryExist tmpdir
unless e $
createDirectory tmpdir
cleanup :: FilePath -> IO ()
try harder to delete test dir on windows
2014-02-03 15:38:20 +00:00
cleanup = cleanup' False
cleanup' :: Bool -> FilePath -> IO ()
cleanup' final dir = whenM (doesDirectoryExist dir) $ do
uninit: Avoid failing final removal in some direct mode repositories due to file modes. Specifically .map files.
2014-07-11 18:52:53 +00:00
Command.Uninit.prepareRemoveAnnexDir dir
try harder to delete test dir on windows
2014-02-03 15:38:20 +00:00
-- This sometimes fails on Windows, due to some files
-- being still opened by a subprocess.
more hlint
2014-02-11 05:35:11 +00:00
catchIO (removeDirectoryRecursive dir) $ \e ->
try harder to delete test dir on windows
2014-02-03 15:38:20 +00:00
when final $ do
print e
putStrLn "sleeping 10 seconds and will retry directory cleanup"
Utility.ThreadScheduler.threadDelaySeconds (Utility.ThreadScheduler.Seconds 10)
more hlint
2014-02-11 05:35:11 +00:00
whenM (doesDirectoryExist dir) $
try harder to delete test dir on windows
2014-02-03 15:38:20 +00:00
removeDirectoryRecursive dir
more tests
2011-01-07 02:22:09 +00:00
checklink :: FilePath -> Assertion
checklink f = do
s <- getSymbolicLinkStatus f
cleanup
2013-05-15 23:58:40 +00:00
-- in direct mode, it may be a symlink, or not, depending
-- on whether the content is present.
unlessM (annexeval Config.isDirect) $
isSymbolicLink s @? f ++ " is not a symlink"
more tests
2011-01-07 02:22:09 +00:00
more tests
2011-01-07 05:02:06 +00:00
checkregularfile :: FilePath -> Assertion
checkregularfile f = do
s <- getSymbolicLinkStatus f
isRegularFile s @? f ++ " is not a normal file"
return ()
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
checkdoesnotexist :: FilePath -> Assertion
checkdoesnotexist f =
avoid using isLeft/isRight which are not available with older ghc versions
2015-06-07 01:13:55 +00:00
(either (const True) (const False) <$> Utility.Exception.tryIO (getSymbolicLinkStatus f))
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
@? f ++ " exists unexpectedly"
checkexists :: FilePath -> Assertion
checkexists f =
avoid using isLeft/isRight which are not available with older ghc versions
2015-06-07 01:13:55 +00:00
(either (const False) (const True) <$> Utility.Exception.tryIO (getSymbolicLinkStatus f))
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
@? f ++ " does not exist"
more tests
2011-01-07 05:02:06 +00:00
checkcontent :: FilePath -> Assertion
checkcontent f = do
some basic tests of preferred content expressions and standard groups
2013-05-25 17:51:36 +00:00
c <- Utility.Exception.catchDefaultIO "could not read file" $ readFile f
cleanup
2013-05-15 23:58:40 +00:00
assertEqual ("checkcontent " ++ f) (content f) c
more tests
2011-01-07 02:22:09 +00:00
checkunwritable :: FilePath -> Assertion
cleanup
2013-05-15 23:58:40 +00:00
checkunwritable f = unlessM (annexeval Config.isDirect) $ do
-- Look at permissions bits rather than trying to write or
-- using fileAccess because if run as root, any file can be
-- modified despite permissions.
s <- getFileStatus f
let mode = fileMode s
more hlint
2014-02-11 05:35:11 +00:00
when (mode == mode `unionFileModes` ownerWriteMode) $
assertFailure $ "able to modify annexed file's " ++ f ++ " content"
more tests
2011-01-07 02:22:09 +00:00
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
checkwritable :: FilePath -> Assertion
checkwritable f = do
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
s <- getFileStatus f
let mode = fileMode s
unless (mode == mode `unionFileModes` ownerWriteMode) $
assertFailure $ "unable to modify " ++ f
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
more tests
2011-01-07 02:22:09 +00:00
checkdangling :: FilePath -> Assertion
more fixes for test suite in direct mode Still quite a few failures.
2013-05-15 23:33:27 +00:00
checkdangling f = ifM (annexeval Config.crippledFileSystem)
( return () -- probably no real symlinks to test
, do
r <- tryIO $ readFile f
case r of
Left _ -> return () -- expected; dangling link
Right _ -> assertFailure $ f ++ " was not a dangling link as expected"
)
more tests
2011-01-07 01:39:26 +00:00
test locationlog contents too
2011-01-11 19:43:29 +00:00
checklocationlog :: FilePath -> Bool -> Assertion
checklocationlog f expected = do
break out non-log stuff to separate module
2011-10-15 21:47:03 +00:00
thisuuid <- annexeval Annex.UUID.getUUID
reorg
2015-12-15 19:34:28 +00:00
r <- annexeval $ Annex.WorkTree.lookupFile f
test locationlog contents too
2011-01-11 19:43:29 +00:00
case r of
replace (Key, Backend) with Key Only fsck and reinject and the test suite used the Backend, and they can look it up as needed from the Key. This simplifies the code and also speeds it up. There is a small behavior change here. Before, all commands would warn when acting on an annexed file with an unknown backend. Now, only fsck and reinject show that warning.
2014-04-17 22:03:39 +00:00
Just k -> do
break module dependancy loop A PITA but worth it to clean up the trust configuration code.
2012-01-10 17:11:16 +00:00
uuids <- annexeval $ Remote.keyLocations k
more hlint
2014-02-11 05:35:11 +00:00
assertEqual ("bad content in location log for " ++ f ++ " key " ++ Types.Key.key2file k ++ " uuid " ++ show thisuuid)
idiomatic elem
2011-01-30 16:01:56 +00:00
expected (thisuuid `elem` uuids)
test locationlog contents too
2011-01-11 19:43:29 +00:00
_ -> assertFailure $ f ++ " failed to look up key"
type alias cleanup
2011-12-31 08:11:39 +00:00
checkbackend :: FilePath -> Types.Backend -> Assertion
improve
2011-12-21 18:10:36 +00:00
checkbackend file expected = do
replace (Key, Backend) with Key Only fsck and reinject and the test suite used the Backend, and they can look it up as needed from the Key. This simplifies the code and also speeds it up. There is a small behavior change here. Before, all commands would warn when acting on an annexed file with an unknown backend. Now, only fsck and reinject show that warning.
2014-04-17 22:03:39 +00:00
b <- annexeval $ maybe (return Nothing) (Backend.getBackend file)
reorg
2015-12-15 19:34:28 +00:00
=<< Annex.WorkTree.lookupFile file
replace (Key, Backend) with Key Only fsck and reinject and the test suite used the Backend, and they can look it up as needed from the Key. This simplifies the code and also speeds it up. There is a small behavior change here. Before, all commands would warn when acting on an annexed file with an unknown backend. Now, only fsck and reinject show that warning.
2014-04-17 22:03:39 +00:00
assertEqual ("backend for " ++ file) (Just expected) b
improve
2011-12-21 18:10:36 +00:00
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
checkispointerfile :: FilePath -> Assertion
checkispointerfile f = unlessM (isJust <$> Annex.Link.isPointerFile f) $
assertFailure $ f ++ " is not a pointer file"
test locationlog contents too
2011-01-11 19:43:29 +00:00
inlocationlog :: FilePath -> Assertion
inlocationlog f = checklocationlog f True
notinlocationlog :: FilePath -> Assertion
notinlocationlog f = checklocationlog f False
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
runchecks :: [FilePath -> Assertion] -> FilePath -> Assertion
runchecks [] _ = return ()
runchecks (a:as) f = do
a f
runchecks as f
annexed_notpresent :: FilePath -> Assertion
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
annexed_notpresent f = ifM (unlockedFiles <$> getTestMode)
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
( annexed_notpresent_unlocked f
, annexed_notpresent_locked f
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
)
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_notpresent_locked :: FilePath -> Assertion
annexed_notpresent_locked = runchecks [checklink, checkdangling, notinlocationlog]
annexed_notpresent_unlocked :: FilePath -> Assertion
annexed_notpresent_unlocked = runchecks [checkregularfile, checkispointerfile, notinlocationlog]
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
annexed_present :: FilePath -> Assertion
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
annexed_present f = ifM (unlockedFiles <$> getTestMode)
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
( annexed_present_unlocked f
, annexed_present_locked f
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
)
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
fix some tests of v6 unlocked files
2016-01-05 21:19:30 +00:00
annexed_present_locked :: FilePath -> Assertion
annexed_present_locked = runchecks
[checklink, checkcontent, checkunwritable, inlocationlog]
annexed_present_unlocked :: FilePath -> Assertion
annexed_present_unlocked = runchecks
[checkregularfile, checkcontent, checkwritable, inlocationlog]
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
unannexed :: FilePath -> Assertion
unannexed = runchecks [checkregularfile, checkcontent, checkwritable]
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
add_annex :: FilePath -> IO Bool
add_annex f = ifM (unlockedFiles <$> getTestMode)
( boolSystem "git" [Param "add", File f]
, git_annex "add" [f]
)
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
data TestMode = TestMode
{ forceDirect :: Bool
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
, unlockedFiles :: Bool
, annexVersion :: Annex.Version.Version
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
, keepFailures :: Bool
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
} deriving (Read, Show)
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
testMode :: TestOptions -> Annex.Version.Version -> TestMode
testMode opts v = TestMode
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
{ forceDirect = False
, unlockedFiles = False
, annexVersion = v
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
, keepFailures = keepFailuresOption opts
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
}
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
withTestMode :: TestMode -> TestTree -> TestTree
withTestMode testmode = withResource prepare release . const
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
where
prepare = do
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
setTestMode testmode
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
case tryIngredients [consoleTestReporter] mempty initTests of
tests should now all run independently, without needing any prior tests to have run Should be ready now for tasty-rerun.
2014-01-21 18:24:30 +00:00
Nothing -> error "No tests found!?"
Just act -> unlessM act $
error "init tests failed! cannot continue"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
return ()
test: Added --keep-failures option.
2016-01-06 17:44:12 +00:00
release _
| keepFailures testmode = void $ tryIO $ do
cleanup' True mainrepodir
removeDirectory tmpdir
| otherwise = cleanup' True tmpdir
use tasty resources
2014-01-21 18:04:50 +00:00
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
setTestMode :: TestMode -> IO ()
setTestMode testmode = do
export CreateProcess fields from Utility.Process update code to avoid cwd and env redefinition warnings
2014-06-10 23:20:14 +00:00
currdir <- getCurrentDirectory
thread env through test suite This will allow porting it to Windows, which cannot set environment except when forking processes. This is nasty, but HUnit can only test the IO monad, so I cannot use a Reader monad.
2013-05-15 21:22:45 +00:00
p <- Utility.Env.getEnvDefault "PATH" ""
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
mapM_ (\(var, val) -> Utility.Env.setEnv var val True)
thread env through test suite This will allow porting it to Windows, which cannot set environment except when forking processes. This is nasty, but HUnit can only test the IO monad, so I cannot use a Reader monad.
2013-05-15 21:22:45 +00:00
-- Ensure that the just-built git annex is used.
export CreateProcess fields from Utility.Process update code to avoid cwd and env redefinition warnings
2014-06-10 23:20:14 +00:00
[ ("PATH", currdir ++ [searchPathSeparator] ++ p)
, ("TOPDIR", currdir)
thread env through test suite This will allow porting it to Windows, which cannot set environment except when forking processes. This is nasty, but HUnit can only test the IO monad, so I cannot use a Reader monad.
2013-05-15 21:22:45 +00:00
-- Avoid git complaining if it cannot determine the user's
-- email address, or exploding if it doesn't know the user's
-- name.
, ("GIT_AUTHOR_EMAIL", "test@example.com")
, ("GIT_AUTHOR_NAME", "git-annex test")
, ("GIT_COMMITTER_EMAIL", "test@example.com")
, ("GIT_COMMITTER_NAME", "git-annex test")
-- force gpg into batch mode for the tests
, ("GPG_BATCH", "1")
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
, ("TESTMODE", show testmode)
thread env through test suite This will allow porting it to Windows, which cannot set environment except when forking processes. This is nasty, but HUnit can only test the IO monad, so I cannot use a Reader monad.
2013-05-15 21:22:45 +00:00
]
starting to work on test suite for v6
2015-12-15 21:19:26 +00:00
getTestMode :: IO TestMode
getTestMode = Prelude.read <$> Utility.Env.getEnvDefault "TESTMODE" ""
setupTestMode :: IO ()
setupTestMode = do
testmode <- getTestMode
when (forceDirect testmode) $
git_annex "direct" ["-q"] @? "git annex direct failed"
remove testenv threading from test suite Simplify the test suite now that I have a way to setEnv on Windows by not threading an environement through it. Incidentially this fixed a failure on Windows, observed when running the test suite in cygwin terminal, where there is apparently an env var named "", and it tried to set that when propigating the environment, which failed. But mostly, it makes the code a lot less horrible. This commit was sponsored by Rémi Vanicat.
2014-12-30 20:58:02 +00:00
changeToTmpDir :: FilePath -> IO ()
changeToTmpDir t = do
topdir <- Utility.Env.getEnvDefault "TOPDIR" (error "TOPDIR not set")
use setCurrentDirectory On POSIX, this just calls changeWorkingDirectory.
2013-05-11 23:14:30 +00:00
setCurrentDirectory $ topdir ++ "/" ++ t
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
tmpdir :: String
more tests
2011-01-07 01:39:26 +00:00
tmpdir = ".t"
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
mainrepodir :: FilePath
couple path separator fixes
2013-06-18 18:08:35 +00:00
mainrepodir = tmpdir </> "repo"
more tests
2011-01-07 01:39:26 +00:00
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
tmprepodir :: IO FilePath
tmprepodir = go (0 :: Int)
where
go n = do
couple path separator fixes
2013-06-18 18:08:35 +00:00
let d = tmpdir </> "tmprepo" ++ show n
Regression test for union merge bug Fixed in 0214e0fb175a608a49b812d81b4632c081f63027
2013-01-17 20:02:58 +00:00
ifM (doesDirectoryExist d)
( go $ n + 1
, return d
)
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
more tests
2011-01-07 05:02:06 +00:00
annexedfile :: String
annexedfile = "foo"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
annexedfiledup :: String
annexedfiledup = "foodup"
improve
2011-12-21 18:10:36 +00:00
wormannexedfile :: String
wormannexedfile = "apple"
add tests of setkey/fromkey
2011-01-11 23:59:11 +00:00
sha1annexedfile :: String
sha1annexedfile = "sha1foo"
add test of adding a second file with the same sha1
2011-01-27 18:01:30 +00:00
sha1annexedfiledup :: String
sha1annexedfiledup = "sha1foodup"
more tests
2011-01-07 05:02:06 +00:00
ingitfile :: String
test suite down to only 4 fails with v6
2015-12-16 20:56:27 +00:00
ingitfile = "bar.c"
more tests
2011-01-07 02:22:09 +00:00
more tests
2011-01-07 05:02:06 +00:00
content :: FilePath -> String
content f
| f == annexedfile = "annexed file content"
| f == ingitfile = "normal file content"
add tests of setkey/fromkey
2011-01-11 23:59:11 +00:00
| f == sha1annexedfile ="sha1 annexed file content"
started working on testing v6 unlocked files Many failures.
2016-01-01 17:59:57 +00:00
| f == annexedfiledup = content annexedfile
add test of adding a second file with the same sha1
2011-01-27 18:01:30 +00:00
| f == sha1annexedfiledup = content sha1annexedfile
improve
2011-12-21 18:10:36 +00:00
| f == wormannexedfile = "worm annexed file content"
fairly complete tests for git-annex import
2015-06-03 18:39:47 +00:00
| "import" `isPrefixOf` f = "imported content"
more tests
2011-01-07 05:02:06 +00:00
| otherwise = "unknown file " ++ f
Test suite improvements. Current top-level test coverage: 65%
2011-01-07 18:06:32 +00:00
changecontent :: FilePath -> IO ()
changecontent f = writeFile f $ changedcontent f
changedcontent :: FilePath -> String
more hlint
2014-02-11 05:35:11 +00:00
changedcontent f = content f ++ " (modified)"
only enable SHA backends that configure finds support for
2011-03-02 17:47:45 +00:00
type alias cleanup
2011-12-31 08:11:39 +00:00
backendSHA1 :: Types.Backend
only enable SHA backends that configure finds support for
2011-03-02 17:47:45 +00:00
backendSHA1 = backend_ "SHA1"
type alias cleanup
2011-12-31 08:11:39 +00:00
backendSHA256 :: Types.Backend
cleanup backend used when reversing migration WORM is no longer the starting backend, so let's really reverse, getting back to SHA256.
2011-12-20 20:06:15 +00:00
backendSHA256 = backend_ "SHA256"
only enable SHA backends that configure finds support for
2011-03-02 17:47:45 +00:00
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
backendSHA256E :: Types.Backend
backendSHA256E = backend_ "SHA256E"
type alias cleanup
2011-12-31 08:11:39 +00:00
backendWORM :: Types.Backend
improve
2011-12-21 18:10:36 +00:00
backendWORM = backend_ "WORM"
type alias cleanup
2011-12-31 08:11:39 +00:00
backend_ :: String -> Types.Backend
more hlint
2014-02-11 05:35:11 +00:00
backend_ = Backend.lookupBackendName
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc
2016-01-07 02:11:21 +00:00
getKey :: Types.Backend -> FilePath -> IO Types.Key
getKey b f = fromJust <$> annexeval go
where
go = Types.Backend.getKey b
Types.KeySource.KeySource
{ Types.KeySource.keyFilename = f
, Types.KeySource.contentLocation = f
, Types.KeySource.inodeCache = Nothing
}
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
#endif
Reference in a new issue Copy permalink