Consolidate apply-lint into clang-format-precommit and fix test_async…

…io test after linting html files (pyodide#1667)
iCodeIN · Jun 26, 2021 · 450a2d2 · 450a2d2
1 parent 043c9cf
commit 450a2d2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -157,9 +157,6 @@ lint: node_modules/.installed
 		conftest.py 				 \
 		docs
 
-apply-lint:
-	./tools/apply-lint.sh
-
 benchmark: all
 	python benchmark/benchmark.py $(HOSTPYTHON) build/benchmarks.json
 	python benchmark/plot_benchmark.py build/benchmarks.json build/benchmarks.png

diff --git a/src/tests/test_asyncio.py b/src/tests/test_asyncio.py
@@ -174,7 +174,7 @@ async def test():
         """
     )
     time.sleep(0.1)
-    msg = "StopIteration: <!doctype html>"
+    msg = "StopIteration: <!DOCTYPE html>"
     with pytest.raises(selenium.JavascriptException, match=msg):
         selenium.run(
             """
@@ -293,7 +293,7 @@ def test_eval_code_await_fetch(selenium):
         """
     )
     time.sleep(0.1)
-    msg = "StopIteration: <!doctype html>"
+    msg = "StopIteration: <!DOCTYPE html>"
     with pytest.raises(selenium.JavascriptException, match=msg):
         selenium.run(
             """

diff --git a/tools/apply-lint.sh b/tools/apply-lint.sh
diff --git a/tools/clang-format-precommit.sh b/tools/clang-format-precommit.sh
@@ -6,7 +6,7 @@ if [ -n "$FILES" ]; then
     git add $FILES
 fi
 
-FILES=$(git diff --cached --name-only *.js)
+FILES=$(git diff --cached --name-only *.js '*.html')
 if [ -n "$FILES" ]; then
     # Change files, stage changes
     ./node_modules/.bin/prettier --write $FILES