From 409fec2a48f454600936eb674da0611566c5a286 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Fri, 14 Feb 2020 13:07:14 +0000
Subject: [PATCH] Add whitelist/blacklist maintenance complainer to buildkite
 annotations (#870)

---
 show-expected-fail-tests.sh | 20 ++++++++++++++++++--
 sytest-whitelist            |  1 -
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/show-expected-fail-tests.sh b/show-expected-fail-tests.sh
index d3872ad59..9cd51b007 100755
--- a/show-expected-fail-tests.sh
+++ b/show-expected-fail-tests.sh
@@ -76,14 +76,30 @@ while read -r test_name; do
 	fi
 done <<< "${passed_but_expected_fail}"
 
+# TODO: Check that the same test doesn't exist in both the whitelist and blacklist
+# TODO: Check that the same test doesn't appear twice in the whitelist|blacklist
+
+# Trim test output strings
+tests_to_add=$(echo -e $tests_to_add | xargs)
+already_in_whitelist=$(echo -e $already_in_whitelist | xargs)
+
+# Format output with markdown for buildkite annotation rendering purposes
+if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then
+	echo "### 📜 SyTest Whitelist Maintenance"
+fi
+
 if [ -n "${tests_to_add}" ]; then
-	echo "ERROR: The following passed tests are not present in $2. Please append them to the file:"
+	echo "**ERROR**: The following tests passed but are not present in \`$2\`. Please append them to the file:"
+    echo "\`\`\`"
 	echo -e "${tests_to_add}"
+    echo "\`\`\`"
 fi
 
 if [ -n "${already_in_whitelist}" ]; then
-	echo "WARN: Tests in the whitelist still marked as expected fail:"
+	echo "**WARN**: Tests in the whitelist still marked as **expected fail**:"
+    echo "\`\`\`"
 	echo -e "${already_in_whitelist}"
+    echo "\`\`\`"
 fi
 
 exit ${fail_build}
diff --git a/sytest-whitelist b/sytest-whitelist
index 47fd58286..eb91b3f0c 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -183,7 +183,6 @@ GET /directory/room/:room_alias yields room ID
 PUT /directory/room/:room_alias creates alias
 Room aliases can contain Unicode
 Creators can delete alias
-Alias creators can delete canonical alias with no ops
 Regular users cannot create room aliases within the AS namespace
 Deleting a non-existent alias should return a 404
 Users can't delete other's aliases