Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile: bump our test/common dependency

Browse source 
... and make use of the new pywrap feature from our test.

Use the same eslint and stylelint plugin configuration as the cockpit
main repo.

Co-authored-by: Katerina Koukiou <kkoukiou@redhat.com>
This commit is contained in:
Allison Karlitskaya 2023-05-26 14:41:33 +02:00 • committed by Martin Pitt
parent 12a648b6e4
commit 2215aa3bf8
4 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.eslintrc.json
View file

@ -4,12 +4,9 @@
"browser": true, "browser": true,
"es6": true "es6": true
}, },
"extends": ["eslint:recommended", "standard", "standard-jsx", "react-app"], "extends": ["eslint:recommended", "standard", "standard-jsx", "standard-react"],
"parserOptions": { "parserOptions": {
"ecmaVersion": "7", "ecmaVersion": "2022",
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module" "sourceType": "module"
}, },
"plugins": ["flowtype", "react", "react-hooks"], "plugins": ["flowtype", "react", "react-hooks"],

8
Makefile
View file

@ -29,12 +29,10 @@ all: $(DIST_TEST)
COCKPIT_REPO_FILES = \ COCKPIT_REPO_FILES = \
pkg/lib \ pkg/lib \
test/common \ test/common \
tools/git-utils.sh \
tools/make-bots \
$(NULL) $(NULL)
COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
COCKPIT_REPO_COMMIT = 3ca979d542a4d6cf865f2132e0bdf1b06c49d07f # 292 + 56 commits COCKPIT_REPO_COMMIT = 63eee8e92dafcbfffe32f7018cbda7c2e7a2642f # 292-75-g63eee8e92
$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
@ -192,8 +190,8 @@ check: prepare-check
TEST_AUDIT_NO_SELINUX=1 test/common/run-tests ${RUN_TESTS_OPTIONS} TEST_AUDIT_NO_SELINUX=1 test/common/run-tests ${RUN_TESTS_OPTIONS}
# checkout Cockpit's bots for standard test VM images and API to launch them # checkout Cockpit's bots for standard test VM images and API to launch them
bots: tools/make-bots bots: $(COCKPIT_REPO_STAMP)
tools/make-bots test/common/make-bots
$(NODE_MODULES_TEST): package.json $(NODE_MODULES_TEST): package.json
# if it exists already, npm install won't update it; force that so that we always get up-to-date packages # if it exists already, npm install won't update it; force that so that we always get up-to-date packages

4
package.json
View file

@ -23,15 +23,16 @@
"esbuild-sass-plugin": "^2.8.0", "esbuild-sass-plugin": "^2.8.0",
"esbuild-wasm": "^0.17.16", "esbuild-wasm": "^0.17.16",
"eslint": "^8.13.0", "eslint": "^8.13.0",
"eslint-config-react-app": "^7.0.0",
"eslint-config-standard": "^17.0.0-1", "eslint-config-standard": "^17.0.0-1",
"eslint-config-standard-jsx": "^11.0.0-1", "eslint-config-standard-jsx": "^11.0.0-1",
"eslint-config-standard-react": "^13.0.0",
"eslint-plugin-flowtype": "^8.0.3", "eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.0.0", "eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.29.4", "eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.4.0", "eslint-plugin-react-hooks": "^4.4.0",
"eslint-plugin-standard": "^5.0.0",
"htmlparser": "^1.7.7", "htmlparser": "^1.7.7",
"jed": "^1.1.1", "jed": "^1.1.1",
"po2json": "^1.0.0-alpha", "po2json": "^1.0.0-alpha",
@ -39,6 +40,7 @@
"sass": "^1.61.0", "sass": "^1.61.0",
"sizzle": "^2.3.3", "sizzle": "^2.3.3",
"stylelint": "^14.9.1", "stylelint": "^14.9.1",
"stylelint-config-standard": "^25.0.0",
"stylelint-config-standard-scss": "^5.0.0", "stylelint-config-standard-scss": "^5.0.0",
"stylelint-formatter-pretty": "^3.2.0" "stylelint-formatter-pretty": "^3.2.0"
}, },

10
test/check-application
View file

@ -1,15 +1,9 @@
#!/usr/bin/python3 #!/usr/bin/python3 -cimport os, sys; os.execv(os.path.dirname(sys.argv[1]) + "/common/pywrap", sys.argv)
# Run this with --help to see available options for tracing and debugging # Run this with --help to see available options for tracing and debugging
# See https://github.com/cockpit-project/cockpit/blob/main/test/common/testlib.py # See https://github.com/cockpit-project/cockpit/blob/main/test/common/testlib.py
# "class Browser" and "class MachineCase" for the available API. # "class Browser" and "class MachineCase" for the available API.
import os
import sys
# import Cockpit's machinery for test VMs and its browser test API
TEST_DIR = os.path.dirname(__file__)
sys.path.append(os.path.join(TEST_DIR, "common"))
sys.path.append(os.path.join(os.path.dirname(TEST_DIR), "bots/machine"))
import testlib import testlib
# Nondestructive tests all run in the same running VM. This allows them to run in Packit, Fedora, and RHEL dist-git gating # Nondestructive tests all run in the same running VM. This allows them to run in Packit, Fedora, and RHEL dist-git gating