rename 'untrusted user' to 'non-secret user' for docker tests
Docker tests require a non-admin user that can read task config from
refs/meta/config in the All-Projects project but can not read other
users' config. Before the change, this user is named 'untrusted user'
which is a bit misleading since we trust the user with task config.
Change the user name to 'non-secret user' to be more faithful to its
characteristics.
Change-Id: I25ee1514d9762ce4411a50369b4d153915668ee9
diff --git a/src/main/resources/Documentation/test/preview.md b/src/main/resources/Documentation/test/preview.md
index 502ade2..55c26eb 100644
--- a/src/main/resources/Documentation/test/preview.md
+++ b/src/main/resources/Documentation/test/preview.md
@@ -316,28 +316,28 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true, # Only Test Suite: !untrusted
- "hasPass" : true, # Only Test Suite: !untrusted
- "name" : "userfile task/special.config PASS", # Only Test Suite: !untrusted
- "status" : "PASS" # Only Test Suite: !untrusted
- "name" : "UNKNOWN", # Only Test Suite: untrusted
- "status" : "UNKNOWN" # Only Test Suite: untrusted
+ "applicable" : true, # Only Test Suite: secret
+ "hasPass" : true, # Only Test Suite: secret
+ "name" : "userfile task/special.config PASS", # Only Test Suite: secret
+ "status" : "PASS" # Only Test Suite: secret
+ "name" : "UNKNOWN", # Only Test Suite: !secret
+ "status" : "UNKNOWN" # Only Test Suite: !secret
},
{
- "applicable" : true, # Only Test Suite: !untrusted
- "hasPass" : true, # Only Test Suite: !untrusted
- "name" : "userfile task/special.config FAIL", # Only Test Suite: !untrusted
- "status" : "FAIL" # Only Test Suite: !untrusted
- "name" : "UNKNOWN", # Only Test Suite: untrusted
- "status" : "UNKNOWN" # Only Test Suite: untrusted
+ "applicable" : true, # Only Test Suite: secret
+ "hasPass" : true, # Only Test Suite: secret
+ "name" : "userfile task/special.config FAIL", # Only Test Suite: secret
+ "status" : "FAIL" # Only Test Suite: secret
+ "name" : "UNKNOWN", # Only Test Suite: !secret
+ "status" : "UNKNOWN" # Only Test Suite: !secret
},
{
- "applicable" : true, # Only Test Suite: !untrusted
- "hasPass" : true, # Only Test Suite: !untrusted
- "name" : "file task/common.config Preload PASS", # Only Test Suite: !untrusted
- "status" : "PASS" # Only Test Suite: !untrusted
- "name" : "UNKNOWN", # Only Test Suite: untrusted
- "status" : "UNKNOWN" # Only Test Suite: untrusted
+ "applicable" : true, # Only Test Suite: secret
+ "hasPass" : true, # Only Test Suite: secret
+ "name" : "file task/common.config Preload PASS", # Only Test Suite: secret
+ "status" : "PASS" # Only Test Suite: secret
+ "name" : "UNKNOWN", # Only Test Suite: !secret
+ "status" : "UNKNOWN" # Only Test Suite: !secret
}
]
}
diff --git a/test/check_task_statuses.sh b/test/check_task_statuses.sh
index 9fb939f..89722a3 100755
--- a/test/check_task_statuses.sh
+++ b/test/check_task_statuses.sh
@@ -315,11 +315,11 @@
usage() { # [error_message]
cat <<-EOF
Usage:
- "$MYPROG" --server <gerrit_host> --untrusted-user <untrusted user>
+ "$MYPROG" --server <gerrit_host> --non-secret-user <non-secret user>
--help|-h help text
--server|-s gerrit host
- --untrusted-user user who don't have permission
+ --non-secret-user user who don't have permission
to view other user refs.
EOF
@@ -354,14 +354,14 @@
case "$1" in
--help|-h) usage ;;
--server|-s) shift ; SERVER=$1 ;;
- --untrusted-user) shift ; UNTRUSTED_USER=$1 ;;
+ --non-secret-user) shift ; NON_SECRET_USER=$1 ;;
*) usage "invalid argument $1" ;;
esac
shift
done
[ -z "$SERVER" ] && usage "You must specify --server"
-[ -z "$UNTRUSTED_USER" ] && usage "You must specify --untrusted-user"
+[ -z "$NON_SECRET_USER" ] && usage "You must specify --non-secret-user"
PORT=29418
@@ -439,11 +439,11 @@
preview_pjson=$(testdoc_2_pjson < "$DOC_PREVIEW" | replace_default_changes)
-echo "$preview_pjson" | remove_suites "invalid" "!untrusted" | \
- ensure json_pp > "$EXPECTED".preview-untrusted
-echo "$preview_pjson" | remove_suites "invalid" "untrusted" | \
+echo "$preview_pjson" | remove_suites "invalid" "secret" | \
+ ensure json_pp > "$EXPECTED".preview-non-secret
+echo "$preview_pjson" | remove_suites "invalid" "!secret" | \
ensure json_pp > "$EXPECTED".preview-admin
-echo "$preview_pjson" | remove_suites "!untrusted" "!invalid" | \
+echo "$preview_pjson" | remove_suites "secret" "!invalid" | \
strip_non_invalid > "$EXPECTED".preview-invalid
testdoc_2_cfg < "$DOC_PREVIEW" | replace_user > "$ROOT_CFG"
@@ -461,7 +461,7 @@
ROOTS=$PREVIEW_ROOTS
test_generated preview-admin --task--preview "$cnum,1" --task--all "$query"
-test_generated preview-untrusted -l "$UNTRUSTED_USER" --task--preview "$cnum,1" --task--all "$query"
+test_generated preview-non-secret -l "$NON_SECRET_USER" --task--preview "$cnum,1" --task--all "$query"
test_generated preview-invalid --task--preview "$cnum,1" --task--invalid "$query"
exit $RESULT
diff --git a/test/docker/run_tests/create-one-time-test-data.sh b/test/docker/run_tests/create-one-time-test-data.sh
index 7ff7d0f..fc841c4 100755
--- a/test/docker/run_tests/create-one-time-test-data.sh
+++ b/test/docker/run_tests/create-one-time-test-data.sh
@@ -8,8 +8,8 @@
create_test_user() {
echo "Creating test user ..."
- gssh create-account "$UNTRUSTED_USER" --full-name "$UNTRUSTED_USER" \
- --email "$UNTRUSTED_USER"@example.com --ssh-key - < ~/.ssh/id_rsa.pub
+ gssh create-account "$NON_SECRET_USER" --full-name "$NON_SECRET_USER" \
+ --email "$NON_SECRET_USER"@example.com --ssh-key - < ~/.ssh/id_rsa.pub
}
setup_all_projects_repo() {
@@ -30,13 +30,13 @@
USER_RUN_TESTS_DIR="$USER_HOME"/"$RUN_TESTS_DIR"
while (( "$#" )) ; do
case "$1" in
- --untrusted-user) shift ; UNTRUSTED_USER="$1" ;;
+ --non-secret-user) shift ; NON_SECRET_USER="$1" ;;
*) die "invalid argument '$1'" ;;
esac
shift
done
-[ -z "$UNTRUSTED_USER" ] && die "untrusted-user not set"
+[ -z "$NON_SECRET_USER" ] && die "non-secret-user not set"
"$USER_RUN_TESTS_DIR"/create-test-project-and-changes.sh
"$USER_RUN_TESTS_DIR"/update-all-users-project.sh
diff --git a/test/docker/run_tests/start.sh b/test/docker/run_tests/start.sh
index 9329d91..a5f33d0 100755
--- a/test/docker/run_tests/start.sh
+++ b/test/docker/run_tests/start.sh
@@ -24,10 +24,10 @@
is_plugin_loaded "task" || die "Task plugin is not installed"
-UNTRUSTED_USER="untrusted_user"
-"$USER_RUN_TESTS_DIR"/create-one-time-test-data.sh --untrusted-user "$UNTRUSTED_USER"
+NON_SECRET_USER="non_secret_user"
+"$USER_RUN_TESTS_DIR"/create-one-time-test-data.sh --non-secret-user "$NON_SECRET_USER"
echo "Running Task plugin tests ..."
cd "$USER_RUN_TESTS_DIR"/../../ && ./check_task_statuses.sh \
- --server "$GERRIT_HOST" --untrusted-user "$UNTRUSTED_USER"
+ --server "$GERRIT_HOST" --non-secret-user "$NON_SECRET_USER"
