summaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-03-17 19:13:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-03-17 19:14:41 -0400
commit9a79dc9ec02a430c21ac720d7c6a4ee11a3edcdd (patch)
tree4fcca1001f62396eb1f9ef0d1357b8ff68d16fd4 /Types
parent17be6b8b6663ac37e5b2f6caba2730ebd4f0f42f (diff)
test suite infra for testing mocked ssh remotes
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Types')
-rw-r--r--Types/Test.hs9
1 files changed, 7 insertions, 2 deletions
diff --git a/Types/Test.hs b/Types/Test.hs
index eadf6d29a..66f263c2e 100644
--- a/Types/Test.hs
+++ b/Types/Test.hs
@@ -1,6 +1,6 @@
{- git-annex test data types.
-
- - Copyright 2011-2015 Joey Hess <id@joeyh.name>
+ - Copyright 2011-2017 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@@ -13,19 +13,24 @@ module Types.Test where
import Test.Tasty.Options
import Data.Monoid
import Prelude
+import Types.Command
#endif
#ifdef WITH_TESTSUITE
data TestOptions = TestOptions
{ tastyOptionSet :: OptionSet
, keepFailuresOption :: Bool
+ , fakeSsh :: Bool
+ , internalData :: CmdParams
}
instance Monoid TestOptions where
- mempty = TestOptions mempty False
+ mempty = TestOptions mempty False False mempty
mappend a b = TestOptions
(tastyOptionSet a <> tastyOptionSet b)
(keepFailuresOption a || keepFailuresOption b)
+ (fakeSsh a || fakeSsh b)
+ (internalData a <> internalData b)
#else
type TestOptions = ()