Commit 40019a5e authored by Connor Baker's avatar Connor Baker
Browse files

testers.testEqualArrayOrMap: unwrap namerefs before passing to avoid nesting

parent 4e6be8f3

pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ assertEqualArray() { 
  local -nr expectedArrayRef="$1"

  local -nr actualArrayRef="$2"



  if ! isDeclaredArray expectedArrayRef; then

  if ! isDeclaredArray "${!expectedArrayRef}"; then

    nixErrorLog "first arugment expectedArrayRef must be an array reference to a declared array"

    exit 1

  fi



  if ! isDeclaredArray actualArrayRef; then

  if ! isDeclaredArray "${!actualArrayRef}"; then

    nixErrorLog "second arugment actualArrayRef must be an array reference to a declared array"

    exit 1

  fi

pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ assertEqualMap() { 
  local -nr expectedMapRef="$1"

  local -nr actualMapRef="$2"



  if ! isDeclaredMap expectedMapRef; then

  if ! isDeclaredMap "${!expectedMapRef}"; then

    nixErrorLog "first arugment expectedMapRef must be an associative array reference to a declared associative array"

    exit 1

  fi



  if ! isDeclaredMap actualMapRef; then

  if ! isDeclaredMap "${!actualMapRef}"; then

    nixErrorLog "second arugment actualMapRef must be an associative array reference to a declared associative array"

    exit 1

  fi