cleanup(netemx): simplify idna and large-file test cases (ooni#1514)

We just need a single IP address in both cases. Helps with ooni/probe#2677.
Murphy-OrangeMud · Feb 13, 2024 · 970f89f · 970f89f
1 parent edbb31c
commit 970f89f
Show file tree

Hide file tree

Showing 46 changed files with 1,179 additions and 17,323 deletions.
diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json
@@ -49,7 +49,7 @@
   "HTTPRoundTripUnexpectedFailure": [],
   "HTTPRoundTripUnexplainedFailure": [],
   "HTTPFinalResponseSuccessTLSWithoutControl": null,
-  "HTTPFinalResponseSuccessTLSWithControl": 50001,
+  "HTTPFinalResponseSuccessTLSWithControl": 50002,
   "HTTPFinalResponseSuccessTCPWithoutControl": null,
   "HTTPFinalResponseSuccessTCPWithControl": null,
   "HTTPFinalResponseDiffBodyProportionFactor": 1,
@@ -64,7 +64,7 @@
       "TagDepth": 0,
       "Type": 3,
       "Failure": "",
-      "TransactionID": 50001,
+      "TransactionID": 50002,
       "TagFetchBody": true,
       "DNSTransactionID": 30001,
       "DNSDomain": "www.example.com",
@@ -78,7 +78,7 @@
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 50001,
+      "EndpointTransactionID": 50002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "93.184.216.34:443",
@@ -121,7 +121,7 @@
       "TagDepth": 0,
       "Type": 1,
       "Failure": "generic_timeout_error",
-      "TransactionID": 50002,
+      "TransactionID": 50001,
       "TagFetchBody": true,
       "DNSTransactionID": 10001,
       "DNSDomain": "www.example.com",
@@ -135,7 +135,7 @@
       "IPAddress": "10.10.34.35",
       "IPAddressASN": null,
       "IPAddressBogon": true,
-      "EndpointTransactionID": 50002,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "10.10.34.35:443",

diff --git a/...al/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json b/...al/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json
@@ -53,7 +53,7 @@
       "TagDepth": 0,
       "Type": 1,
       "Failure": "generic_timeout_error",
-      "TransactionID": 50002,
+      "TransactionID": 50001,
       "TagFetchBody": true,
       "DNSTransactionID": 10001,
       "DNSDomain": "www.example.com",
@@ -67,7 +67,7 @@
       "IPAddress": "10.10.34.35",
       "IPAddressASN": null,
       "IPAddressBogon": true,
-      "EndpointTransactionID": 50002,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "10.10.34.35:443",

diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json
@@ -216,7 +216,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "tcp_connect": [
@@ -232,7 +232,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 50002
+        "transaction_id": 50001
       },
       {
         "ip": "93.184.216.34",
@@ -246,7 +246,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "tls_handshakes": [
@@ -265,7 +265,7 @@
           "fetch_body=true"
         ],
         "tls_version": "TLSv1.3",
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "x_control_request": {
@@ -282,10 +282,10 @@
         ]
       },
       "tcp_connect": [
-        "93.184.216.34:443",
-        "93.184.216.34:80",
         "10.10.34.35:443",
-        "10.10.34.35:80"
+        "10.10.34.35:80",
+        "93.184.216.34:443",
+        "93.184.216.34:80"
       ],
       "x_quic_enabled": false
     },

diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json
@@ -262,50 +262,45 @@
   "KnownTCPEndpoints": {
     "50001": {
       "TagDepth": 0,
-      "Type": 3,
-      "Failure": "",
+      "Type": 1,
+      "Failure": "generic_timeout_error",
       "TransactionID": 50001,
       "TagFetchBody": true,
-      "DNSTransactionID": 30001,
+      "DNSTransactionID": 10001,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "93.184.216.34"
+        "10.10.34.35"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "93.184.216.34",
-      "IPAddressASN": 15133,
-      "IPAddressBogon": false,
+      "IPAddress": "10.10.34.35",
+      "IPAddressASN": null,
+      "IPAddressBogon": true,
       "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "93.184.216.34:443",
-      "TCPConnectFailure": "",
-      "TLSHandshakeFailure": "",
-      "TLSServerName": "www.example.com",
-      "HTTPRequestURL": "https://www.example.com/",
-      "HTTPFailure": "",
-      "HTTPResponseStatusCode": 200,
-      "HTTPResponseBodyLength": 1533,
-      "HTTPResponseBodyIsTruncated": false,
-      "HTTPResponseHeadersKeys": {
-        "Alt-Svc": true,
-        "Content-Length": true,
-        "Content-Type": true,
-        "Date": true
-      },
+      "EndpointAddress": "10.10.34.35:443",
+      "TCPConnectFailure": "generic_timeout_error",
+      "TLSHandshakeFailure": null,
+      "TLSServerName": null,
+      "HTTPRequestURL": null,
+      "HTTPFailure": null,
+      "HTTPResponseStatusCode": null,
+      "HTTPResponseBodyLength": null,
+      "HTTPResponseBodyIsTruncated": null,
+      "HTTPResponseHeadersKeys": null,
       "HTTPResponseLocation": null,
-      "HTTPResponseTitle": "Default Web Page",
-      "HTTPResponseIsFinal": true,
+      "HTTPResponseTitle": null,
+      "HTTPResponseIsFinal": null,
       "ControlDNSDomain": "www.example.com",
       "ControlDNSLookupFailure": "",
       "ControlDNSResolvedAddrs": [
         "93.184.216.34"
       ],
-      "ControlTCPConnectFailure": "",
-      "ControlTLSHandshakeFailure": "",
+      "ControlTCPConnectFailure": null,
+      "ControlTLSHandshakeFailure": null,
       "ControlHTTPFailure": "",
       "ControlHTTPResponseStatusCode": 200,
       "ControlHTTPResponseBodyLength": 1533,
@@ -319,45 +314,50 @@
     },
     "50002": {
       "TagDepth": 0,
-      "Type": 1,
-      "Failure": "generic_timeout_error",
+      "Type": 3,
+      "Failure": "",
       "TransactionID": 50002,
       "TagFetchBody": true,
-      "DNSTransactionID": 10001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "10.10.34.35"
+        "93.184.216.34"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "10.10.34.35",
-      "IPAddressASN": null,
-      "IPAddressBogon": true,
+      "IPAddress": "93.184.216.34",
+      "IPAddressASN": 15133,
+      "IPAddressBogon": false,
       "EndpointTransactionID": 50002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "10.10.34.35:443",
-      "TCPConnectFailure": "generic_timeout_error",
-      "TLSHandshakeFailure": null,
-      "TLSServerName": null,
-      "HTTPRequestURL": null,
-      "HTTPFailure": null,
-      "HTTPResponseStatusCode": null,
-      "HTTPResponseBodyLength": null,
-      "HTTPResponseBodyIsTruncated": null,
-      "HTTPResponseHeadersKeys": null,
+      "EndpointAddress": "93.184.216.34:443",
+      "TCPConnectFailure": "",
+      "TLSHandshakeFailure": "",
+      "TLSServerName": "www.example.com",
+      "HTTPRequestURL": "https://www.example.com/",
+      "HTTPFailure": "",
+      "HTTPResponseStatusCode": 200,
+      "HTTPResponseBodyLength": 1533,
+      "HTTPResponseBodyIsTruncated": false,
+      "HTTPResponseHeadersKeys": {
+        "Alt-Svc": true,
+        "Content-Length": true,
+        "Content-Type": true,
+        "Date": true
+      },
       "HTTPResponseLocation": null,
-      "HTTPResponseTitle": null,
-      "HTTPResponseIsFinal": null,
+      "HTTPResponseTitle": "Default Web Page",
+      "HTTPResponseIsFinal": true,
       "ControlDNSDomain": "www.example.com",
       "ControlDNSLookupFailure": "",
       "ControlDNSResolvedAddrs": [
         "93.184.216.34"
       ],
-      "ControlTCPConnectFailure": null,
-      "ControlTLSHandshakeFailure": null,
+      "ControlTCPConnectFailure": "",
+      "ControlTLSHandshakeFailure": "",
       "ControlHTTPFailure": "",
       "ControlHTTPResponseStatusCode": 200,
       "ControlHTTPResponseBodyLength": 1533,

diff --git a/...inipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json b/...inipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json
@@ -55,11 +55,11 @@
     }
   ],
   "KnownTCPEndpoints": {
-    "50002": {
+    "50001": {
       "TagDepth": 0,
       "Type": 1,
       "Failure": "generic_timeout_error",
-      "TransactionID": 50002,
+      "TransactionID": 50001,
       "TagFetchBody": true,
       "DNSTransactionID": 10001,
       "DNSDomain": "www.example.com",
@@ -73,7 +73,7 @@
       "IPAddress": "10.10.34.35",
       "IPAddressASN": null,
       "IPAddressBogon": true,
-      "EndpointTransactionID": 50002,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "10.10.34.35:443",

diff --git a/...ipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json b/...ipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json
@@ -50,7 +50,7 @@
   "HTTPRoundTripUnexpectedFailure": [],
   "HTTPRoundTripUnexplainedFailure": [],
   "HTTPFinalResponseSuccessTLSWithoutControl": null,
-  "HTTPFinalResponseSuccessTLSWithControl": 50001,
+  "HTTPFinalResponseSuccessTLSWithControl": 50002,
   "HTTPFinalResponseSuccessTCPWithoutControl": null,
   "HTTPFinalResponseSuccessTCPWithControl": null,
   "HTTPFinalResponseDiffBodyProportionFactor": 1,
@@ -65,7 +65,7 @@
       "TagDepth": 0,
       "Type": 3,
       "Failure": "",
-      "TransactionID": 50001,
+      "TransactionID": 50002,
       "TagFetchBody": true,
       "DNSTransactionID": 30001,
       "DNSDomain": "www.example.com",
@@ -79,7 +79,7 @@
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 50001,
+      "EndpointTransactionID": 50002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "93.184.216.34:443",

diff --git a/...line/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json b/...line/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json
@@ -214,7 +214,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "tcp_connect": [
@@ -230,7 +230,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "tls_handshakes": [
@@ -249,7 +249,7 @@
           "fetch_body=true"
         ],
         "tls_version": "TLSv1.3",
-        "transaction_id": 50001
+        "transaction_id": 50002
       }
     ],
     "x_control_request": {
@@ -266,10 +266,10 @@
         ]
       },
       "tcp_connect": [
-        "93.184.216.34:443",
-        "93.184.216.34:80",
         "127.0.0.1:443",
-        "127.0.0.1:80"
+        "127.0.0.1:80",
+        "93.184.216.34:443",
+        "93.184.216.34:80"
       ],
       "x_quic_enabled": false
     },

diff --git a/...ine/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json b/...ine/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json
@@ -260,11 +260,11 @@
     }
   ],
   "KnownTCPEndpoints": {
-    "50001": {
+    "50002": {
       "TagDepth": 0,
       "Type": 3,
       "Failure": "",
-      "TransactionID": 50001,
+      "TransactionID": 50002,
       "TagFetchBody": true,
       "DNSTransactionID": 30001,
       "DNSDomain": "www.example.com",
@@ -278,7 +278,7 @@
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 50001,
+      "EndpointTransactionID": 50002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "93.184.216.34:443",