Cleanup

Author: chrmarti

src/javascript-node/test-project/test-utils.sh

@@ -61,33 +61,6 @@ checkOSPackages() {
     fi
 }
 
-checkExtension() {
-    # Happens asynchronusly, so keep retrying 10 times with an increasing delay
-    EXTN_ID="$1"
-    TIMEOUT_SECONDS="${2:-10}"
-    RETRY_COUNT=0
-    echo -e -n "\n🧪 Looking for extension $1 for maximum of ${TIMEOUT_SECONDS}s"
-    until [ "${RETRY_COUNT}" -eq "${TIMEOUT_SECONDS}" ] || \
-        [ ! -e $HOME/.vscode-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-server-insiders/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-test-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-remote/extensions/${EXTN_ID}* ]
-    do
-        sleep 1s
-        (( RETRY_COUNT++ ))
-        echo -n "."
-    done
-
-    if [ ${RETRY_COUNT} -lt ${TIMEOUT_SECONDS} ]; then
-        echo -e "\n✅ Passed!"
-        return 0
-    else
-        echoStderr -e "\n❌ Extension $EXTN_ID not found."
-        FAILED+=("$LABEL")
-        return 1
-    fi
-}
-
 checkCommon()
 {
     PACKAGE_LIST="apt-utils \

src/javascript-node/test-project/test.sh

@@ -6,8 +6,7 @@ source test-utils.sh node
 # Run common tests
 checkCommon
 
-# Definition specific tests
-checkExtension "dbaeumer.vscode-eslint"
+# Image specific tests
 check "node" node --version
 sudo rm -f yarn.lock
 check "yarn" yarn install

src/typescript-node/README.md

@@ -32,7 +32,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-1.16`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
-Beyond TypeScript, Node.js, and `git`, this image / `Dockerfile` includes `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `node` user with `sudo` access, and a set of common dependencies for development. Since `tslint` is [now fully deprecated](https://github.com/palantir/tslint/issues/4534), the definition includes `tslint-to-eslint-config` globally to help you migrate.
+Beyond TypeScript, Node.js, and `git`, this image / `Dockerfile` includes `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `node` user with `sudo` access, and a set of common dependencies for development. Since `tslint` is [now fully deprecated](https://github.com/palantir/tslint/issues/4534), the image includes `tslint-to-eslint-config` globally to help you migrate.
 
 Note that, while `eslint`and `typescript` are installed globally for convenance, [as of ESLint 6](https://eslint.org/docs/user-guide/migrating-to-6.0.0#-plugins-and-shareable-configs-are-no-longer-affected-by-eslints-location), you will need to install the following packages locally to lint TypeScript code: `@typescript-eslint/eslint-plugin`, `@typescript-eslint/parser`, `eslint`, `typescript`.
 

src/typescript-node/test-project/test-utils.sh

@@ -61,33 +61,6 @@ checkOSPackages() {
     fi
 }
 
-checkExtension() {
-    # Happens asynchronusly, so keep retrying 10 times with an increasing delay
-    EXTN_ID="$1"
-    TIMEOUT_SECONDS="${2:-10}"
-    RETRY_COUNT=0
-    echo -e -n "\n🧪 Looking for extension $1 for maximum of ${TIMEOUT_SECONDS}s"
-    until [ "${RETRY_COUNT}" -eq "${TIMEOUT_SECONDS}" ] || \
-        [ ! -e $HOME/.vscode-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-server-insiders/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-test-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-remote/extensions/${EXTN_ID}* ]
-    do
-        sleep 1s
-        (( RETRY_COUNT++ ))
-        echo -n "."
-    done
-
-    if [ ${RETRY_COUNT} -lt ${TIMEOUT_SECONDS} ]; then
-        echo -e "\n✅ Passed!"
-        return 0
-    else
-        echoStderr -e "\n❌ Extension $EXTN_ID not found."
-        FAILED+=("$LABEL")
-        return 1
-    fi
-}
-
 checkCommon()
 {
     PACKAGE_LIST="apt-utils \

src/typescript-node/test-project/test.sh

@@ -6,8 +6,7 @@ source test-utils.sh node
 # Run common tests
 checkCommon
 
-# Definition specific tests
-checkExtension "dbaeumer.vscode-eslint"
+# Image specific tests
 check "node" node --version
 sudo rm -f yarn.lock
 check "yarn" yarn install