remote: tests-io cleanup

haskell-nix · Dec 7, 2023 · e5c1492 · e5c1492
1 parent b7a9f91
commit e5c1492
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 112 deletions.
diff --git a/hnix-store-remote/hnix-store-remote.cabal b/hnix-store-remote/hnix-store-remote.cabal
@@ -193,15 +193,12 @@ test-suite remote-io
     buildable: False
 
   type:              exitcode-stdio-1.0
-  main-is:           Driver.hs
+  main-is:           Main.hs
   hs-source-dirs:    tests-io
   -- See https://github.com/redneb/hs-linux-namespaces/issues/3
   ghc-options:       -rtsopts -fprof-auto "-with-rtsopts -V0"
   other-modules:
-      NixDaemon
-    , Spec
-  build-tool-depends:
-    tasty-discover:tasty-discover
+      NixDaemonSpec
   build-depends:
       base >=4.12 && <5
     , hnix-store-core
@@ -218,8 +215,6 @@ test-suite remote-io
     , linux-namespaces
     , process
     , some
-    , tasty
-    , tasty-hspec
     , temporary
     , text
     , unix

diff --git a/hnix-store-remote/tests-io/Driver.hs b/hnix-store-remote/tests-io/Driver.hs
diff --git a/hnix-store-remote/tests-io/Main.hs b/hnix-store-remote/tests-io/Main.hs
@@ -0,0 +1,12 @@
+module Main where
+
+import qualified Test.Hspec
+import qualified NixDaemonSpec
+
+-- we run remote tests in
+-- Linux namespaces to avoid interacting with systems store
+main :: IO ()
+main = do
+  NixDaemonSpec.enterNamespaces
+  Test.Hspec.hspec
+    NixDaemonSpec.spec