vcan in pipeline

milesstoetzner · Sep 21, 2023 · 37c4723 · 37c4723
1 parent 4df0fcb
commit 37c4723
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -4,6 +4,7 @@ on:
     push:
         branches:
             - main
+            - fix-workflow-tests
     pull_request:
         branches:
             - main
@@ -33,6 +34,13 @@ jobs:
             - name: (PREPARE) Install Node Modules
               run: yarn --frozen-lockfile
 
+            - name: (PREPARE) Setup SocketCAN
+              run: |
+                  sudo apt-get install -y can-utils libnode-dev linux-modules-extra-$(uname -r)
+                  sudo modprobe can
+                  sudo modprobe can_raw
+                  sudo modprobe vcan
+
             ###################################################
             #
             # Test
@@ -48,4 +56,4 @@ jobs:
               run: yarn style:check
 
             - name: (TEST) Run Tests
-              run: yarn test
+              run: sudo yarn test
diff --git a/src/core/message.ts b/src/core/message.ts
@@ -46,7 +46,12 @@ export default class Message {
     }
 
     static fromCAN(message: CANMessage): Message {
-        return this.fromJSON({id: message.id, data: Array.from(message.data), ext: message.ext, rtr: message.rtr})
+        return this.fromJSON({
+            id: message.id,
+            data: Array.from(message.data),
+            ext: message.ext ?? false,
+            rtr: message.rtr ?? false,
+        })
     }
 
     toCAN(): CANMessage {

diff --git a/tests/can/can.test.ts b/tests/can/can.test.ts
@@ -6,7 +6,7 @@ import * as utils from '#utils'
 import {expect} from 'chai'
 import {afterEach} from 'mocha'
 
-describe.skip('can', () => {
+describe('can', () => {
     const vcan = 'can2x'
 
     beforeEach(async () => {
@@ -36,6 +36,8 @@ describe.skip('can', () => {
             source: 'console',
             sourceId: String(message.id),
             sourceData: message.data.map(String),
+            sourceExt: message.ext,
+            sourceRtr: message.rtr,
             target: 'can',
             targetName: vcan,
         })

diff --git a/tests/complex/complex.test.ts b/tests/complex/complex.test.ts
@@ -9,7 +9,7 @@ import {afterEach} from 'mocha'
 /**
  * console2can --(can2x1)--> can2socketio -> socketio2can --(can2x2)--> can2file
  */
-describe.skip('complex', () => {
+describe('complex', () => {
     beforeEach(async () => {
         try {
             await actions.startVCAN({
@@ -56,6 +56,8 @@ describe.skip('complex', () => {
             source: 'console',
             sourceId: String(message.id),
             sourceData: message.data.map(String),
+            sourceExt: message.ext,
+            sourceRtr: message.rtr,
             target: 'can',
             targetName: 'can2x1',
         })