Skip to content

Commit e13d66e

Browse files
committed
Fixed incorrect tests
The previous fixes now let the CLI to produce the correct output.
1 parent 2194a37 commit e13d66e

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

internal/integrationtest/monitor/monitor_test.go

+11-16
Original file line numberDiff line numberDiff line change
@@ -287,30 +287,25 @@ yun.serial.disableDTR=true
287287
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndFQBN)
288288
require.NoError(t, err)
289289
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
290-
require.Contains(t, string(stdout), "Configuration rts = off")
290+
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
291291
require.Contains(t, string(stdout), "Configuration dtr = on")
292292
})
293293

294294
t.Run("WithDefaultPortAndConfig", func(t *testing.T) {
295-
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfig)
296-
require.NoError(t, err)
297-
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
298-
require.Contains(t, string(stdout), "Configuration rts = off")
299-
require.Contains(t, string(stdout), "Configuration dtr = on")
300-
require.Contains(t, string(stdout), "Configuration baudrate = 57600")
301-
require.Contains(t, string(stdout), "Configuration bits = 9")
302-
require.Contains(t, string(stdout), "Configuration parity = none")
303-
require.Contains(t, string(stdout), "Configuration stop_bits = 1")
295+
_, stderr, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfig)
296+
require.Error(t, err)
297+
require.Contains(t, string(stderr), "Profile 'profile1' not found")
298+
require.Contains(t, string(stderr), "Unknown FQBN: unknown package arduino")
304299
})
305300

306301
t.Run("WithDefaultPortAndConfigAndProfile", func(t *testing.T) {
307-
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfigAndProfile)
302+
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "uno", sketchWithPortAndConfigAndProfile)
308303
require.NoError(t, err)
309-
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
310-
require.Contains(t, string(stdout), "Configuration rts = off")
304+
require.Contains(t, string(stdout), "Opened port: /dev/ttyPROF")
305+
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
311306
require.Contains(t, string(stdout), "Configuration dtr = on")
312-
require.Contains(t, string(stdout), "Configuration baudrate = 57600")
313-
require.Contains(t, string(stdout), "Configuration bits = 9")
307+
require.Contains(t, string(stdout), "Configuration baudrate = 19200")
308+
require.Contains(t, string(stdout), "Configuration bits = 8")
314309
require.Contains(t, string(stdout), "Configuration parity = none")
315310
require.Contains(t, string(stdout), "Configuration stop_bits = 1")
316311
})
@@ -377,7 +372,7 @@ yun.serial.disableDTR=true
377372
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-p", "/dev/ttyARGS", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndFQBN)
378373
require.NoError(t, err)
379374
require.Contains(t, string(stdout), "Opened port: /dev/ttyARGS")
380-
require.Contains(t, string(stdout), "Configuration rts = off")
375+
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
381376
require.Contains(t, string(stdout), "Configuration dtr = on")
382377
})
383378
})
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
default_port: /dev/ttyDEF
2-
default_fqbn: arduino:avr:yun
31
profiles:
42
profile1:
53
fqbn: "broken_fqbn"
4+
platforms:
5+
- platform: arduino:avr (1.8.6)
6+
7+
default_port: /dev/ttyDEF
8+
default_fqbn: arduino:avr:yun

0 commit comments

Comments
 (0)