diff --git a/internal/experiment/webconnectivitylte/analysisclassic.go b/internal/experiment/webconnectivitylte/analysisclassic.go index eae59c41b4..08d391622f 100644 --- a/internal/experiment/webconnectivitylte/analysisclassic.go +++ b/internal/experiment/webconnectivitylte/analysisclassic.go @@ -293,7 +293,7 @@ func analysisClassicComputeBlockingAccessible(woa *minipipeline.WebAnalysis, tk } // 3.1.2. Otherwise, if the control worked, that's blocking. - tk.setBlockingString("http-failure") + tk.setBlockingString("tls") tk.setHTTPExperimentFailure(entry.Failure) return } @@ -306,7 +306,7 @@ func analysisClassicComputeBlockingAccessible(woa *minipipeline.WebAnalysis, tk } // 3.3. Handle the case where just the probe failed. - tk.setBlockingString("http-failure") + tk.setBlockingString("tls") tk.setHTTPExperimentFailure(entry.Failure) return } @@ -327,7 +327,7 @@ func analysisClassicComputeBlockingAccessible(woa *minipipeline.WebAnalysis, tk } // 4.1.2. Otherwise, if the control worked, that's blocking. - tk.setBlockingString("http-failure") + tk.setBlockingString("tcp_ip") tk.setHTTPExperimentFailure(entry.Failure) return } diff --git a/internal/experiment/webconnectivityqa/redirect.go b/internal/experiment/webconnectivityqa/redirect.go index 25d6c7cad1..c303b540cb 100644 --- a/internal/experiment/webconnectivityqa/redirect.go +++ b/internal/experiment/webconnectivityqa/redirect.go @@ -11,7 +11,7 @@ import ( func redirectWithConsistentDNSAndThenConnectionRefusedForHTTP() *TestCase { return &TestCase{ Name: "redirectWithConsistentDNSAndThenConnectionRefusedForHTTP", - Flags: 0, + Flags: TestCaseFlagNoV04, Input: "https://bit.ly/32447", Configure: func(env *netemx.QAEnv) { @@ -39,7 +39,7 @@ func redirectWithConsistentDNSAndThenConnectionRefusedForHTTP() *TestCase { XDNSFlags: 0, XBlockingFlags: 2, // AnalysisBlockingFlagTCPIPBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tcp_ip", }, } } @@ -49,7 +49,7 @@ func redirectWithConsistentDNSAndThenConnectionRefusedForHTTP() *TestCase { func redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS() *TestCase { return &TestCase{ Name: "redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS", - Flags: 0, + Flags: TestCaseFlagNoV04, Input: "https://bit.ly/21645", Configure: func(env *netemx.QAEnv) { @@ -77,7 +77,7 @@ func redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS() *TestCase { XDNSFlags: 0, XBlockingFlags: 2, // AnalysisBlockingFlagTCPIPBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tcp_ip", }, } } @@ -125,7 +125,7 @@ func redirectWithConsistentDNSAndThenConnectionResetForHTTP() *TestCase { func redirectWithConsistentDNSAndThenConnectionResetForHTTPS() *TestCase { return &TestCase{ Name: "redirectWithConsistentDNSAndThenConnectionResetForHTTPS", - Flags: 0, + Flags: TestCaseFlagNoV04, Input: "https://bit.ly/21645", Configure: func(env *netemx.QAEnv) { @@ -153,7 +153,7 @@ func redirectWithConsistentDNSAndThenConnectionResetForHTTPS() *TestCase { XDNSFlags: 0, XBlockingFlags: 4, // AnalysisBlockingFlagTLSBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tls", }, } } @@ -232,7 +232,7 @@ func redirectWithConsistentDNSAndThenEOFForHTTP() *TestCase { func redirectWithConsistentDNSAndThenEOFForHTTPS() *TestCase { return &TestCase{ Name: "redirectWithConsistentDNSAndThenEOFForHTTPS", - Flags: 0, + Flags: TestCaseFlagNoV04, Input: "https://bit.ly/21645", Configure: func(env *netemx.QAEnv) { @@ -260,7 +260,7 @@ func redirectWithConsistentDNSAndThenEOFForHTTPS() *TestCase { XDNSFlags: 0, XBlockingFlags: 4, // AnalysisBlockingFlagTLSBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tls", }, } } @@ -309,7 +309,7 @@ func redirectWithConsistentDNSAndThenTimeoutForHTTP() *TestCase { func redirectWithConsistentDNSAndThenTimeoutForHTTPS() *TestCase { return &TestCase{ Name: "redirectWithConsistentDNSAndThenTimeoutForHTTPS", - Flags: 0, + Flags: TestCaseFlagNoV04, Input: "https://bit.ly/21645", LongTest: true, Configure: func(env *netemx.QAEnv) { @@ -338,7 +338,7 @@ func redirectWithConsistentDNSAndThenTimeoutForHTTPS() *TestCase { XDNSFlags: 0, XBlockingFlags: 4, // AnalysisBlockingFlagTLSBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tls", }, } } diff --git a/internal/experiment/webconnectivityqa/tlsblocking.go b/internal/experiment/webconnectivityqa/tlsblocking.go index d737435b9d..c51bfa4b62 100644 --- a/internal/experiment/webconnectivityqa/tlsblocking.go +++ b/internal/experiment/webconnectivityqa/tlsblocking.go @@ -10,6 +10,7 @@ import ( func tlsBlockingConnectionResetWithConsistentDNS() *TestCase { return &TestCase{ Name: "tlsBlockingConnectionResetWithConsistentDNS", + Flags: TestCaseFlagNoV04, Input: "https://www.example.com/", Configure: func(env *netemx.QAEnv) { @@ -31,7 +32,7 @@ func tlsBlockingConnectionResetWithConsistentDNS() *TestCase { XStatus: 8448, // StatusExperimentHTTP | StatusAnomalyReadWrite XBlockingFlags: 4, // AnalysisBlockingFlagTLSBlocking Accessible: false, - Blocking: "http-failure", + Blocking: "tls", }, } }