fix hf mirror bug and related test cases

Author: sidecus

src/magicmirror/install.sh

@@ -28,7 +28,7 @@ if [ "${OS}" = '"Ubuntu"' ] && [ -n "${UBUNTU_MIRROR}" ]; then
     sed -i "s/ports.ubuntu.com/${UBUNTU_MIRROR}/g" /etc/apt/sources.list
 fi
 
-# Pypi mirror. TODO[sidecus]: Check Python installation
+# Pypi mirror.
 PYPI_MIRROR=${PYPI_MIRROR:-""}
 echo "PYPI_MIRROR: $PYPI_MIRROR"
 if [ -n "${PYPI_MIRROR}" ]; then
@@ -53,6 +53,7 @@ echo "HUGGINGFACE_MIRROR: $HUGGINGFACE_MIRROR"
 if [ -n "${HUGGINGFACE_MIRROR}" ]; then
     echo "Enabling Huggingface mirror: ${HUGGINGFACE_MIRROR}"
     touch /etc/environment && cp /etc/environment /etc/environment.mm.bak
-    echo "HF_ENDPOINT=${HF_ENDPOINT}" >> /etc/environment
+    echo "HF_ENDPOINT=${HUGGINGFACE_MIRROR}" >> /etc/environment
+    # export the new env
     set -a; . /etc/environment; set +a;
 fi

test/magicmirror/hf.sh

@@ -10,7 +10,7 @@ source dev-container-features-test-lib
 
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib.
-check "test HF mirror" bash -c '[ "${HF_ENDPOINT}"="https://dummy-hf-mirror.com" ];'
+check "test HF mirror" bash -c "test \"${HF_ENDPOINT}\" = \"https://dummy-hf-mirror.com\""
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.

test/magicmirror/test.sh

@@ -20,6 +20,7 @@
 # UBUNTU_MIRROR=""
 # PYPI_MIRROR=""
 # APK_MIRROR=""
+# HUGGINGFACE_MIRROR=""
 
 #
 # These scripts are run as 'root' by default. Although that can be changed
@@ -44,9 +45,10 @@ source dev-container-features-test-lib
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib. Syntax is...
 # check <LABEL> <cmd> [args...]
-check "test no ubuntu mirror" bash -c "! (test -e /etc/apt/sources.list.bak) && ! (cat /etc/apt/sources.list | grep 'mirrors.bfsu.edu.cn')"
-check "test no pypi mirror" bash -c "! (test -e /etc/pip.conf) || ! (cat /etc/pip.conf | grep 'mirrors.bfsu.edu.cn')"
-check "test no apk mirror" bash -c "! (test -e /etc/apk/repositories) || ! (cat /etc/apk/repositories | grep 'mirrors.tuna.tsinghua.edu.cn')"
+check "test no ubuntu mirror" bash -c "! (test -f /etc/apt/sources.list.mm.bak)"
+check "test no pypi mirror" bash -c "! (test -f /etc/pip.conf.mm.bak)"
+check "test no apk mirror" bash -c "! (test -f /etc/apk/repositories.mm.bak)"
+check "test no huggingface mirror" bash -c "! (test -f /etc/environment.mm.bak) && (test -z \"${HF_ENDPOINT}\"))"
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.