From 41e436db729e8001b5d47bbdc52a816822dddbc6 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 27 Aug 2018 17:44:35 +0200 Subject: tlsfuzzer: remove duplicate tests and sort them alphabetically Signed-off-by: Daiki Ueno --- tests/suite/tls-fuzzer/gnutls-nocert-tls13.json | 48 +++++++++++-------------- 1 file changed, 20 insertions(+), 28 deletions(-) (limited to 'tests/suite/tls-fuzzer') diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json index 8357b0f215..7b01c25ae8 100644 --- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json +++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json @@ -12,24 +12,23 @@ "server_hostname": "localhost", "server_port": @PORT@, "tests" : [ - {"name" : "test-tls13-legacy-version.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-empty-alert.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-hrr.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-nociphers.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-pkcs-signature.py", + {"name" : "test-tls13-0rtt-garbage.py", "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-rsa-signatures.py", - "arguments": ["-p", "@PORT@", "-b"]}, - {"name" : "test-tls13-rsapss-signatures.py", - "arguments": ["-p", "@PORT@", "-b"]}, {"name" : "test-tls13-conversation.py", "arguments": ["-p", "@PORT@"]}, + {"name" : "test-tls13-count-tickets.py", + "arguments": ["-p", "@PORT@", "-t", "1"]}, {"name" : "test-tls13-empty-alert.py", "arguments": ["-p", "@PORT@"]}, + {"name" : "test-tls13-ffdhe-sanity.py", + "arguments": ["-p", "@PORT@"]}, + {"name" : "test-tls13-finished.py", + "comment" : "the disabled tests timeout very often due to slow tls-fuzzer implementation", + "arguments": ["-p", "@PORT@", "-n", "5", + "-e", "padding - cipher TLS_AES_128_GCM_SHA256, pad_byte 0, pad_left 0, pad_right 16777183", + "-e", "padding - cipher TLS_AES_256_GCM_SHA384, pad_byte 0, pad_left 0, pad_right 16777167"]}, + {"name" : "test-tls13-hrr.py", + "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-legacy-version.py", "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-nociphers.py", @@ -38,26 +37,19 @@ "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-record-padding.py", "arguments": ["-p", "@PORT@"]}, + {"name" : "test-tls13-rsapss-signatures.py", + "arguments": ["-p", "@PORT@", "-b"]}, + {"name" : "test-tls13-rsa-signatures.py", + "arguments": ["-p", "@PORT@", "-b"]}, + {"name" : "test-tls13-session-resumption.py", + "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-signature-algorithms.py", "arguments": ["-p", "@PORT@"]}, + {"name" : "test-tls13-unrecognised-groups.py", + "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-version-negotiation.py", "arguments": ["-p", "@PORT@"]}, {"name" : "test-tls13-zero-length-data.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-finished.py", - "commoent" : "the disabled tests timeout very often due to slow tls-fuzzer implementation", - "arguments": ["-p", "@PORT@", "-n", "5", - "-e", "padding - cipher TLS_AES_128_GCM_SHA256, pad_byte 0, pad_left 0, pad_right 16777183", - "-e", "padding - cipher TLS_AES_256_GCM_SHA384, pad_byte 0, pad_left 0, pad_right 16777167"]}, - {"name" : "test-tls13-count-tickets.py", - "arguments": ["-p", "@PORT@", "-t", "1"]}, - {"name" : "test-tls13-0rtt-garbage.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-ffdhe-sanity.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-session-resumption.py", - "arguments": ["-p", "@PORT@"]}, - {"name" : "test-tls13-unrecognised-groups.py", "arguments": ["-p", "@PORT@"]} ] } -- cgit v1.2.1