Skip to content

Commit 7e1ac80

Browse files
committed
Fix evemu test for evtest 1.32
/umockdev-run/integration/input-evtest-evemu test: Be more liberal in parsing evtest's SYN event output, as it changed in 1.32.
1 parent 0222040 commit 7e1ac80

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.8.7 (UNRELEASED)
2+
------------------
3+
- /umockdev-run/integration/input-evtest-evemu test: Be more liberal in parsing
4+
evtest's SYN event output, as it changed in 1.32.
5+
16
0.8.6 (2014-09-01)
27
------------------
38
- Fix compilation on sparc with gcc 4.9.

tests/test-umockdev-run.vala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,11 +659,14 @@ E: 0.500000 0001 001e 0000 # EV_KEY / KEY_A 0
659659
sout[sout_len] = 0;
660660
string output = (string) sout;
661661

662-
assert_in ("""Event: time 0.000000, -------------- SYN_REPORT ------------
663-
Event: time 0.200000, type 4 (EV_MSC), code 4 (MSC_SCAN), value 70004
662+
// this can be followed by SYN_REPORT or EV_SYN depending on the evtest
663+
// version
664+
assert_in ("Event: time 0.000000, -------------- ", output);
665+
assert_in ("""Event: time 0.200000, type 4 (EV_MSC), code 4 (MSC_SCAN), value 70004
664666
Event: time 0.200000, type 1 (EV_KEY), code 30 (KEY_A), value 1
665-
Event: time 0.200000, -------------- SYN_REPORT ------------
666-
Event: time 0.500000, type 4 (EV_MSC), code 4 (MSC_SCAN), value 70004
667+
""", output);
668+
assert_in ("Event: time 0.200000, -------------- ", output);
669+
assert_in ("""Event: time 0.500000, type 4 (EV_MSC), code 4 (MSC_SCAN), value 70004
667670
Event: time 0.500000, type 1 (EV_KEY), code 30 (KEY_A), value 0
668671
""", output);
669672
}

0 commit comments

Comments
 (0)