lachrimae/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Add some test for nix flake init with conflicts

Browse source
This commit is contained in:
Théophane Hufschmitt 2022-06-29 16:28:46 +02:00
parent f8fea9075c
commit 83f96e61a4
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/flakes.sh
View file

@ -408,8 +408,10 @@ cat > $templatesDir/trivial/flake.nix <<EOF
}; };
} }
EOF EOF
echo a > $templatesDir/trivial/a
echo b > $templatesDir/trivial/b
git -C $templatesDir add flake.nix trivial/flake.nix git -C $templatesDir add flake.nix trivial/
git -C $templatesDir commit -m 'Initial' git -C $templatesDir commit -m 'Initial'
nix flake check templates nix flake check templates
@ -424,6 +426,18 @@ nix flake show $flake7Dir
nix flake show $flake7Dir --json | jq nix flake show $flake7Dir --json | jq
git -C $flake7Dir commit -a -m 'Initial' git -C $flake7Dir commit -a -m 'Initial'
# Test 'nix flake init' with benign conflicts
rm -rf $flake7Dir && mkdir $flake7Dir && git -C $flake7Dir init
echo a > $flake7Dir/a
(cd $flake7Dir && nix flake init) # check idempotence
# Test 'nix flake init' with conflicts
rm -rf $flake7Dir && mkdir $flake7Dir && git -C $flake7Dir init
echo b > $flake7Dir/a
pushd $flake7Dir
(! nix flake init) |& grep "refusing to overwrite existing file '$flake7Dir/a'"
popd
# Test 'nix flake new'. # Test 'nix flake new'.
rm -rf $flake6Dir rm -rf $flake6Dir
nix flake new -t templates#trivial $flake6Dir nix flake new -t templates#trivial $flake6Dir