george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"make confidence": Use GID numbers, not names. Makes tests less fragile.

Browse Source
This commit is contained in:
tal@whatexit.org
2016-03-15 21:22:29 -04:00
parent 3a4a79284c
commit 1643ea7fd9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/confidence_test.sh
View File

@@ -191,27 +191,25 @@ gpg --import keyrings/live/pubring.gpg
# Pick a GID to use: # Pick a GID to use:
# This users's default group: # This users's default group:
DEFAULT_GID_NAME=$(id -gn) DEFAULT_GID_NUM=$(id -g)
# Pick a group that is not the default group: # Pick a group that is not the default group:
TEST_GID_NUM=$(id -G | fmt -1 | tail -n +2 | grep -xv "$(id -u)" | head -n 1) TEST_GID_NUM=$(id -G | fmt -1 | grep -xv "$(id -u)" | grep -xv "$(id -g)" | head -1)
TEST_GID_NAME=$(python -c 'import grp; print grp.getgrgid('"$TEST_GID_NUM"').gr_name') echo "DEFAULT_GID_NUM=$DEFAULT_GID_NUM"
echo "DEFAULT_GID_NAME=$DEFAULT_GID_NAME"
echo "TEST_GID_NUM=$TEST_GID_NUM" echo "TEST_GID_NUM=$TEST_GID_NUM"
echo "TEST_GID_NAME=$TEST_GID_NAME"
PHASE 'Bob postdeploys... default.' PHASE 'Bob postdeploys... default.'
blackbox_postdeploy blackbox_postdeploy
assert_file_exists secret.txt assert_file_exists secret.txt
assert_file_exists secret.txt.gpg assert_file_exists secret.txt.gpg
assert_file_md5hash secret.txt "08a3fa763a05c018a38e9924363b97e7" assert_file_md5hash secret.txt "08a3fa763a05c018a38e9924363b97e7"
assert_file_group secret.txt "$DEFAULT_GID_NAME" assert_file_group secret.txt "$DEFAULT_GID_NUM"
PHASE 'Bob postdeploys... with a GID.' PHASE 'Bob postdeploys... with a GID.'
blackbox_postdeploy "$TEST_GID_NUM" blackbox_postdeploy "$TEST_GID_NUM"
assert_file_exists secret.txt assert_file_exists secret.txt
assert_file_exists secret.txt.gpg assert_file_exists secret.txt.gpg
assert_file_md5hash secret.txt "08a3fa763a05c018a38e9924363b97e7" assert_file_md5hash secret.txt "08a3fa763a05c018a38e9924363b97e7"
assert_file_group secret.txt "$TEST_GID_NAME" assert_file_group secret.txt "$TEST_GID_NUM"
PHASE 'Bob cleans up the secret.' PHASE 'Bob cleans up the secret.'
rm secret.txt rm secret.txt

4
tools/test_functions.sh
View File

@@ -63,10 +63,10 @@ function assert_file_group() {
case $(uname -s) in case $(uname -s) in
Darwin|FreeBSD ) Darwin|FreeBSD )
found=$(stat -f '%Sg' "$file") found=$(stat -f '%Dg' "$file")
;; ;;
Linux ) Linux )
found=$(stat -c '%G' "$file") found=$(stat -c '%g' "$file")
;; ;;
CYGWIN* ) CYGWIN* )
echo "ASSERT_FILE_GROUP: Running on Cygwin. Not being tested." echo "ASSERT_FILE_GROUP: Running on Cygwin. Not being tested."