From 4afb1b255496c15e626e57847a36a794423a7756 Mon Sep 17 00:00:00 2001 From: Shreyas Date: Wed, 1 Jul 2015 19:11:03 -0400 Subject: [PATCH 1/2] Added an exclamation point. 1, 2, 3! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3215799..055837b 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Mercurial, suddenly we are less able to share our code with other people. Communication between subteams of an organization is hurt. You can't collaborate as well. Either you find yourself emailing individual files around (yuck!), making a special repo with just -the files needed by your collaborators (yuck!), or just deciding that +the files needed by your collaborators (yuck!!), or just deciding that collaboration isn't worth all that effort (yuck!!!). The ability to be open and transparent about our code, with the From f5eeffd043b031ee8f4810a281a9b0c66ebeca36 Mon Sep 17 00:00:00 2001 From: "tlimoncelli@stackexchange.com" Date: Fri, 3 Jul 2015 15:05:31 +0000 Subject: [PATCH 2/2] confidence_test.sh: assert_file_group() fails if gid name includes space. --- tools/confidence_test.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/confidence_test.sh b/tools/confidence_test.sh index 10ca5ed..cd3d7f4 100755 --- a/tools/confidence_test.sh +++ b/tools/confidence_test.sh @@ -64,17 +64,26 @@ function assert_file_md5hash() { function assert_file_group() { local file="$1" local wanted="$2" + local found assert_file_exists "$file" case $(uname -s) in + Darwin|FreeBSD ) + found=$(stat -f '%Sg' $file) + ;; + Linux ) + found=$(stat -c '%G' $file) + ;; CYGWIN* ) echo "ASSERT_FILE_GROUP: Running on Cygwin. Not being tested." return 0 ;; + * ) + echo 'ERROR: Unknown OS. Exiting.' + exit 1 + ;; esac - local found=$(ls -lg "$file" | awk '{ print $3 }') - # NB(tlim): We could do this with 'stat' but it would break on BSD-style OSs. if [[ "$wanted" != "$found" ]]; then echo "ASSERT FAILED: $file chgrp wanted=$wanted found=$found" exit 1 @@ -286,9 +295,9 @@ DEFAULT_GID_NAME=$(id -gn) # 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_NAME=$(python -c 'import grp; print grp.getgrgid('"$TEST_GID_NUM"').gr_name') -echo DEFAULT_GID_NAME=$DEFAULT_GID_NAME -echo TEST_GID_NUM=$TEST_GID_NUM -echo TEST_GID_NAME=$TEST_GID_NAME +echo "DEFAULT_GID_NAME=$DEFAULT_GID_NAME" +echo "TEST_GID_NUM=$TEST_GID_NUM" +echo "TEST_GID_NAME=$TEST_GID_NAME" PHASE 'Bob postdeploys... default.' blackbox_postdeploy