Merge 88b22a4378 into d54568642b

.github/workflows/build.yml

@@ -32,13 +32,6 @@ jobs:
       - name: Build application
         run: |
           make build_dev
-      - name: Run tests
-        run: |
-          go test ./... -json > testreport.json
-      - name: Golang Test Report
-        uses: becheran/go-testreport@v0.3.2
-        with:
-          output: "testreport.json"
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -1,6 +1,3 @@
 bin/*
 static/*
 .idea
-.DS_Store
-
-device-tests.tar.gz

Makefile

@@ -22,29 +22,6 @@ build_dev: hash_resource
 	@echo "Building..."
 	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="$(GO_LDFLAGS) -X $(KVM_PKG_NAME).builtAppVersion=$(VERSION_DEV)" -o bin/jetkvm_app cmd/main.go
 
-build_test2json:
-	GOOS=linux GOARCH=arm GOARM=7 go build -o bin/test2json cmd/test2json
-
-build_dev_test: build_test2json
-# collect all directories that contain tests
-	@echo "Building tests for devices ..."
-	@rm -rf bin/tests && mkdir -p bin/tests
-	GOOS=linux GOARCH=arm GOARM=7 \
-		go test -v \
-		-ldflags="$(GO_LDFLAGS) -X $(KVM_PKG_NAME).builtAppVersion=$(VERSION_DEV)" \
-		-c -o bin/tests ./...; \
-
-	@cat resource/dev_test.sh > bin/tests/run_all_tests
-	@for test in bin/tests/*.test; do \
-		chmod +x $$test; \
-		base_name=$$(basename $$test); \
-		echo "runTest ./$$base_name" >> bin/tests/run_all_tests; \
-	done; \
-	chmod +x bin/tests/run_all_tests; \
-	cp bin/test2json bin/tests/; \
-	chmod +x bin/tests/test2json; \
-	tar czfv device-tests.tar.gz -C bin/tests .
-
 frontend:
 	cd ui && npm ci && npm run build:device
 

dev_deploy.sh

@@ -3,19 +3,6 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-C_RST="$(tput sgr0)"
-C_ERR="$(tput setaf 1)"
-C_OK="$(tput setaf 2)"
-C_WARN="$(tput setaf 3)"
-C_INFO="$(tput setaf 5)"
-
-msg() { printf '%s%s%s\n' $2 "$1" $C_RST; }
-
-msg_info() { msg "$1" $C_INFO; }
-msg_ok() { msg "$1" $C_OK; }
-msg_err() { msg "$1" $C_ERR; }
-msg_warn() { msg "$1" $C_WARN; }
-
 # Function to display help message
 show_help() {
     echo "Usage: $0 [options] -r <remote_ip>"
@@ -25,7 +12,6 @@ show_help() {
     echo
     echo "Optional:"
     echo "  -u, --user <remote_user>   Remote username (default: root)"
-    echo "      --run-go-tests         Run go tests"
     echo "      --skip-ui-build        Skip frontend/UI build"
     echo "      --help                 Display this help message"
     echo
@@ -40,7 +26,6 @@ REMOTE_PATH="/userdata/jetkvm/bin"
 SKIP_UI_BUILD=false
 RESET_USB_HID_DEVICE=false
 LOG_TRACE_SCOPES="${LOG_TRACE_SCOPES:-jetkvm,cloud,websocket,native,jsonrpc}"
-RUN_GO_TESTS=false
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
@@ -61,10 +46,6 @@ while [[ $# -gt 0 ]]; do
             RESET_USB_HID_DEVICE=true
             shift
             ;;
-        --run-go-tests)
-            RUN_GO_TESTS=true
-            shift
-            ;;
         --help)
             show_help
             exit 0
@@ -79,41 +60,24 @@ done
 
 # Verify required parameters
 if [ -z "$REMOTE_HOST" ]; then
-    msg_err "Error: Remote IP is a required parameter"
+    echo "Error: Remote IP is a required parameter"
     show_help
-    exit 1
 fi
 
 # Build the development version on the host
 if [ "$SKIP_UI_BUILD" = false ]; then
-    msg_info "▶ Building frontend"
     make frontend
 fi
-
-msg_info "▶ Building go binary"
 make build_dev
 
-if [ "$RUN_GO_TESTS" = true ]; then
+# Change directory to the binary output directory
-    msg_info "▶ Building go tests"
+cd bin
-    make build_dev_test  
-
-    msg_info "▶ Copying device-tests.tar.gz to remote host"
-    ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/device-tests.tar.gz" < device-tests.tar.gz
-
-    msg_info "▶ Running go tests"
-    ssh "${REMOTE_USER}@${REMOTE_HOST}" ash << EOF
-set -e
-cd ${REMOTE_PATH}
-tar zxvf device-tests.tar.gz
-./run_all_tests -test.v
-EOF
-fi
 
 # Kill any existing instances of the application
 ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
 
 # Copy the binary to the remote host
-ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < jetkvm_app_debug
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < jetkvm_app
 
 if [ "$RESET_USB_HID_DEVICE" = true ]; then
     # Remove the old USB gadget configuration
@@ -142,4 +106,4 @@ chmod +x jetkvm_app_debug
 PION_LOG_TRACE=${LOG_TRACE_SCOPES} ./jetkvm_app_debug
 EOF
 
-echo "Deployment complete."
+echo "Deployment complete."

internal/confparser/confparser_test.go

@@ -57,13 +57,12 @@ func TestValidateConfig(t *testing.T) {
 	}
 }
 
-func TestValidateIPv4StaticConfigNetmaskRequiredIfStatic(t *testing.T) {
+func TestValidateIPv4StaticConfigRequired(t *testing.T) {
 	config := &testNetworkConfig{
 		IPv4Static: &testIPv4StaticConfig{
 			Address: null.StringFrom("192.168.1.1"),
 			Gateway: null.StringFrom("192.168.1.1"),
 		},
-		IPv4Mode: null.StringFrom("static"),
 	}
 
 	err := SetDefaultsAndValidate(config)
@@ -72,20 +71,6 @@ func TestValidateIPv4StaticConfigNetmaskRequiredIfStatic(t *testing.T) {
 	}
 }
 
-func TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic(t *testing.T) {
-	config := &testNetworkConfig{
-		IPv4Static: &testIPv4StaticConfig{
-			Address: null.StringFrom("192.168.1.1"),
-			Gateway: null.StringFrom("192.168.1.1"),
-		},
-	}
-
-	err := SetDefaultsAndValidate(config)
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-}
-
 func TestValidateIPv4StaticConfigRequiredIf(t *testing.T) {
 	config := &testNetworkConfig{
 		IPv4Mode: null.StringFrom("static"),

resource/dev_test.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-JSON_OUTPUT=false
-if [ "$1" = "-json" ]; then
-    JSON_OUTPUT=true
-    shift
-fi
-ADDITIONAL_ARGS=$@
-EXIT_CODE=0
-
-runTest() {
-    if [ "$JSON_OUTPUT" = true ]; then
-        ./test2json $1 -test.v $ADDITIONAL_ARGS | tee $1.result.json
-        if [ $? -ne 0 ]; then
-            EXIT_CODE=1
-        fi
-    else
-        $@
-        if [ $? -ne 0 ]; then
-            EXIT_CODE=1
-        fi
-    fi
-}
-
-
-function exit_with_code() {
-    if [ $EXIT_CODE -ne 0 ]; then
-        printf "\e[0;31m❌ Test failed\e[0m\n"
-    else
-        printf "\e[0;32m✅ All tests passed\e[0m\n"
-    fi
-
-    exit $EXIT_CODE
-}
-
-trap exit_with_code EXIT