Skip to content

Commit e5c1492

Browse files
committed
remote: tests-io cleanup
1 parent b7a9f91 commit e5c1492

File tree

5 files changed

+176
-112
lines changed

5 files changed

+176
-112
lines changed

hnix-store-remote/hnix-store-remote.cabal

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,12 @@ test-suite remote-io
193193
buildable: False
194194

195195
type: exitcode-stdio-1.0
196-
main-is: Driver.hs
196+
main-is: Main.hs
197197
hs-source-dirs: tests-io
198198
-- See https://github.com/redneb/hs-linux-namespaces/issues/3
199199
ghc-options: -rtsopts -fprof-auto "-with-rtsopts -V0"
200200
other-modules:
201-
NixDaemon
202-
, Spec
203-
build-tool-depends:
204-
tasty-discover:tasty-discover
201+
NixDaemonSpec
205202
build-depends:
206203
base >=4.12 && <5
207204
, hnix-store-core
@@ -218,8 +215,6 @@ test-suite remote-io
218215
, linux-namespaces
219216
, process
220217
, some
221-
, tasty
222-
, tasty-hspec
223218
, temporary
224219
, text
225220
, unix

hnix-store-remote/tests-io/Driver.hs

Lines changed: 0 additions & 9 deletions
This file was deleted.

hnix-store-remote/tests-io/Main.hs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module Main where
2+
3+
import qualified Test.Hspec
4+
import qualified NixDaemonSpec
5+
6+
-- we run remote tests in
7+
-- Linux namespaces to avoid interacting with systems store
8+
main :: IO ()
9+
main = do
10+
NixDaemonSpec.enterNamespaces
11+
Test.Hspec.hspec
12+
NixDaemonSpec.spec

0 commit comments

Comments
 (0)