Merge pull request #3826 from reubenmiller/test-dir-file-count-assertion

test: improve directory file count assertion

Author: reubenmiller

tests/RobotFramework/requirements/requirements.adapter-docker.txt

@@ -1 +1 @@
-robotframework-devicelibrary[docker] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.22.2
+robotframework-devicelibrary[docker] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.23.0

tests/RobotFramework/requirements/requirements.adapter-local.txt

@@ -1 +1 @@
-robotframework-devicelibrary[local] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.22.2
+robotframework-devicelibrary[local] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.23.0

tests/RobotFramework/requirements/requirements.adapter-ssh.txt

@@ -1,2 +1,2 @@
-robotframework-devicelibrary[ssh] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.22.2
+robotframework-devicelibrary[ssh] @ git+https://github.com/thin-edge/robotframework-devicelibrary.git@1.23.0
 robotframework-sshlibrary~=3.8.0

tests/RobotFramework/tests/tedge_write.robot

@@ -34,21 +34,21 @@ ${REGULAR_USER}     user
 
 *** Test Cases ***
 Sudo elevates permissions when tedge-write writes to a root-owned file
-    ${dest_file}=    Create a temporary file
+    ${dir}    ${dest_file}=    Create a temporary file
     Make file inaccessible to regular users    ${dest_file}
 
     Write content to file using sudo tedge-write as user    tedge    ${dest_file}
 
-    There should be no leftover temporary files    ${dest_file}
+    There should be no leftover temporary files    ${dir}
 
 Sudo doesn't elevate permissions when tedge-write is run by another user
-    ${dest_file}=    Create a temporary file
+    ${dir}    ${dest_file}=    Create a temporary file
     Make file inaccessible to regular users    ${dest_file}
 
     Write content to file using sudo tedge-write as user
     ...    ${REGULAR_USER}    ${dest_file}    exp_exit_code=!0
 
-    There should be no leftover temporary files    ${dest_file}
+    There should be no leftover temporary files    ${dir}
 
 Creates a destination file if it doesn't exist
     [Template]    Creates a destination file if it doesn't exist
@@ -73,31 +73,31 @@ Preserves permissions if a destination exists
 Creates a destination file if it doesn't exist
     [Arguments]    ${umask}
 
-    ${dest_filename}=    Create a temporary file    dry_run=${True}
+    ${dir}    ${dest_filename}=    Create a temporary file    dry_run=${True}
     # `tedge-write` is prepended with `umask ${umask}` because new umask only applies to the current
     # process, and `Execute Command` starts a new shell process every time
     Execute Command as user    tedge
     ...    umask ${umask} && echo abc | sudo tedge-write ${dest_filename}    strip=True
 
     Path Should Have Permissions    ${dest_filename}    owner_group=root:root
 
-    There should be no leftover temporary files    ${dest_filename}
+    There should be no leftover temporary files    ${dir}
 
 Changes permissions if a destination doesn't exist
     [Arguments]    ${umask}
 
-    ${dest_filename}=    Create a temporary file    dry_run=${True}
+    ${dir}    ${dest_filename}=    Create a temporary file    dry_run=${True}
     Execute Command as user    tedge
     ...    umask ${umask} && echo abc | sudo tedge-write ${dest_filename} --user tedge --group tedge --mode 700
 
     Path Should Have Permissions    ${dest_filename}    mode=700    owner_group=tedge:tedge
 
-    There should be no leftover temporary files    ${dest_filename}
+    There should be no leftover temporary files    ${dir}
 
 Preserves permissions if a destination exists
     [Arguments]    ${umask}
 
-    ${dest_file}=    Create a temporary file
+    ${dir}    ${dest_file}=    Create a temporary file
     Execute Command    chown tedge:tedge ${dest_file}
     Execute Command    chmod 666 ${dest_file}
 
@@ -106,7 +106,7 @@ Preserves permissions if a destination exists
 
     Path Should Have Permissions    ${dest_file}    mode=666    owner_group=tedge:tedge
 
-    There should be no leftover temporary files    ${dest_file}
+    There should be no leftover temporary files    ${dir}
 
 Custom Setup
     Setup    register=${False}
@@ -123,7 +123,7 @@ Create a temporary file
     [Arguments]    ${dry_run}=${False}
     ${dir}=    Execute Command    mktemp --tmpdir\=/tmp --directory    strip=True
     ${path}=    Execute Command    mktemp --tmpdir\=${dir} ${{'--dry-run' if ${dry_run} is True else ''}}    strip=True
-    RETURN    ${path}
+    RETURN    ${dir}    ${path}
 
 Remove temporary test directories
     [Documentation]    Remove test directories created in _Create a temporary file_ keyword.
@@ -146,9 +146,7 @@ Execute Command as user
     Execute Command    sudo -n --user\=${user} bash -c '${command}'    &{named}
 
 There should be no leftover temporary files
-    [Documentation]    Assuming ${dest_file} was the only file in a temporary directory that was written to by
+    [Documentation]    Assuming ${dir} was the only file in a temporary directory that was written to by
     ...    tedge-agent, check that there are no other files in the directory after using tedge-write.
-    [Arguments]    ${dest_file}
-
-    ${num_files}=    Execute Command    ls $(dirname ${dest_file}) | wc -l    strip=True
-    Should Be Equal    ${num_files}    1
+    [Arguments]    ${dir}
+    Directory Should Have File Count    ${dir}    minimum=1    maximum=1