Merge pull request #194 from nix-community/pytest

fix arguments not passed in use_nix + regression tests

direnvrc

@@ -313,7 +313,6 @@ use_nix() {
   then
     local tmp_profile="${layout_dir}/flake-profile.$$"
     local tmp_profile_rc
-    local extra_args=()
 
     if [[ "$packages" != "" ]]; then
       extra_args+=("--expr" "with import <nixpkgs> {}; mkShell { buildInputs = [ $packages ]; }")

tests/test_use_nix.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python2
+
+import sys
+import subprocess
+import unittest
+
+from procs import run
+from direnv_project import DirenvProject
+
+
+def direnv_exec(direnv_project: DirenvProject, cmd: str) -> None:
+    out = run(
+        ["direnv", "exec", str(direnv_project.dir), "sh", "-c", cmd],
+        stderr=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        check=False,
+        cwd=direnv_project.dir,
+    )
+    sys.stdout.write(out.stdout)
+    sys.stderr.write(out.stderr)
+    assert out.returncode == 0
+    assert "OK\n" == out.stdout
+    assert "renewed cache" in out.stderr
+
+
+def test_attrs(direnv_project: DirenvProject) -> None:
+    direnv_project.setup_envrc("use nix -A subshell")
+    direnv_exec(direnv_project, "echo $THIS_IS_A_SUBSHELL")
+
+
+def test_args(direnv_project: DirenvProject) -> None:
+    direnv_project.setup_envrc("use nix --argstr someArg OK")
+    direnv_exec(direnv_project, "echo $SHOULD_BE_SET")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/testenv/shell.nix

@@ -1,7 +1,14 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> {}, someArg ? null }:
 pkgs.mkShellNoCC {
   nativeBuildInputs = [ pkgs.hello ];
   shellHook = ''
     echo "Executing shellHook."
   '';
+  SHOULD_BE_SET = someArg;
+
+  passthru = {
+    subshell = pkgs.mkShellNoCC {
+      THIS_IS_A_SUBSHELL = "OK";
+    };
+  };
 }