From 43cb4f27da74184da350c62cad8dd573590b09c6 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 9 May 2019 13:35:40 +0200 Subject: tests/py: Fix JSON equivalents of osf tests Fixes: 12adf747a3f62 ("tests: py: add osf tests with versions") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/py/inet/osf.t.json | 59 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) (limited to 'tests/py') diff --git a/tests/py/inet/osf.t.json b/tests/py/inet/osf.t.json index a2e74495..cedb7f67 100644 --- a/tests/py/inet/osf.t.json +++ b/tests/py/inet/osf.t.json @@ -45,13 +45,14 @@ } ] -# osf name version "Linux:3.0" +# osf ttl skip version "Linux:3.0" [ { "match": { "left": { "osf": { - "key": "version" + "key": "version", + "ttl": "skip" } }, "op": "==", @@ -80,6 +81,26 @@ } ] +# osf version { "Windows:XP", "MacOs:Sierra" } +[ + { + "match": { + "left": { + "osf": { + "key": "version" + } + }, + "op": "==", + "right": { + "set": [ + "Windows:XP", + "MacOs:Sierra" + ] + } + } + } +] + # ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 } [ { @@ -113,3 +134,37 @@ } } ] + +# ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 } +[ + { + "mangle": { + "key": { + "ct": { + "key": "mark" + } + }, + "value": { + "map": { + "data": { + "set": [ + [ + "Windows:XP", + 3 + ], + [ + "MacOs:Sierra", + 4 + ] + ] + }, + "key": { + "osf": { + "key": "version" + } + } + } + } + } + } +] -- cgit v1.2.3