From 639825c943b5d5618d2d6be289274d40d8c5f5ac Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Thu, 9 Mar 2023 10:12:48 +0100 Subject: [PATCH 1/3] bats: update 1.8.2 -> 1.9.0 --- pkgs/development/interpreters/bats/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 00aada39652d..4e7effcbb802 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -22,13 +22,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-Kitlx26cK2RiAC+PdRIdDLF5crorg6UB6uSzbKCrDHE="; + sha256 = "sha256-nKBNbqJYRd/3tO85E6KrOh32yOaNKpLXxz5gQ5Uvmcc="; }; patchPhase = '' @@ -91,6 +91,8 @@ resholve.mkDerivation rec { "$pre_command" = true; "$BATS_TEST_NAME" = true; "${placeholder "out"}/libexec/bats-core/bats-exec-test" = true; + "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; + "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; }; execer = [ /* From a42a71cdbb618d2f999ff7a1d2c873f65d941f5e Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sat, 11 Mar 2023 10:32:26 +0100 Subject: [PATCH 2/3] bats: bats-assert 2.0.0 -> 2.1.0 --- pkgs/development/interpreters/bats/libraries.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index ef0b40c31b7c..9e60a4dc992c 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: { - bats-assert = stdenv.mkDerivation { + bats-assert = stdenv.mkDerivation rec { pname = "bats-assert"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-assert"; - rev = "v2.0.0"; - sha256 = "sha256-whSbAj8Xmnqclf78dYcjf1oq099ePtn4XX9TUJ9AlyQ="; + rev = "v${version}"; + sha256 = "sha256-opgyrkqTwtnn/lUjMebbLfS/3sbI2axSusWd5i/5wm4="; }; dontBuild = true; installPhase = '' @@ -23,13 +23,13 @@ }; }; - bats-file = stdenv.mkDerivation { + bats-file = stdenv.mkDerivation rec { pname = "bats-file"; version = "0.3.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-file"; - rev = "v0.3.0"; + rev = "v${version}"; sha256 = "sha256-3xevy0QpwNZrEe+2IJq58tKyxQzYx8cz6dD2nz7fYUM="; }; dontBuild = true; @@ -47,13 +47,13 @@ }; }; - bats-support = stdenv.mkDerivation { + bats-support = stdenv.mkDerivation rec { pname = "bats-support"; version = "0.3.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-support"; - rev = "v0.3.0"; + rev = "v${version}"; sha256 = "sha256-4N7XJS5XOKxMCXNC7ef9halhRpg79kUqDuRnKcrxoeo="; }; dontBuild = true; From f4fcb40eb45ccd25d5631d81d7fb410d4ab1f58e Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sat, 11 Mar 2023 10:48:09 +0100 Subject: [PATCH 3/3] bats: add bats-file library test --- pkgs/development/interpreters/bats/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 4e7effcbb802..97a209f20841 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -138,8 +138,15 @@ resholve.mkDerivation rec { setup() { bats_load_library bats-support bats_load_library bats-assert + bats_load_library bats-file bats_require_minimum_version 1.5.0 + + TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')" + } + + teardown() { + temp_del "$TEST_TEMP_DIR" } @test echo_hi { @@ -152,10 +159,17 @@ resholve.mkDerivation rec { assert_line --index 0 "cp: missing file operand" assert_line --index 1 "Try 'cp --help' for more information." } + + @test file_exists { + echo "hi" > "$TEST_TEMP_DIR/hello.txt" + assert_file_exist "$TEST_TEMP_DIR/hello.txt" + run cat "$TEST_TEMP_DIR/hello.txt" + assert_output "hi" + } ''; passAsFile = [ "testScript" ]; } '' - ${bats.withLibraries (p: [ p.bats-support p.bats-assert ])}/bin/bats "$testScriptPath" + ${bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file ])}/bin/bats "$testScriptPath" touch "$out" '';