c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(oonimkall): export CheckInConfig.RunType (#752)

Browse Source 
This commit cherry-picks e3e3b61 from release/3.15.

See https://github.com/ooni/probe/issues/2110 for context.
This commit is contained in:
Simone Basso 2022-05-23 18:41:34 +02:00 committed by GitHub
parent c8f91983ca
commit 83cf447edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/oonimkall/session.go
View File

@ -366,7 +366,7 @@ type CheckInConfig struct {
// RunType indicates whether this is an automated (model.RunTypeTimed) run // RunType indicates whether this is an automated (model.RunTypeTimed) run
// or otherwise a manual run initiated by the user. // or otherwise a manual run initiated by the user.
RunType model.RunType RunType string
// SoftwareName is the name of the application. // SoftwareName is the name of the application.
SoftwareName string SoftwareName string
@ -472,7 +472,7 @@ func (sess *Session) CheckIn(ctx *Context, config *CheckInConfig) (*CheckInInfo,
Platform: config.Platform, Platform: config.Platform,
ProbeASN: info.ASNString(), ProbeASN: info.ASNString(),
ProbeCC: info.CountryCode, ProbeCC: info.CountryCode,
RunType: config.RunType, RunType: model.RunType(config.RunType),
SoftwareVersion: config.SoftwareVersion, SoftwareVersion: config.SoftwareVersion,
WebConnectivity: config.WebConnectivity.toModel(), WebConnectivity: config.WebConnectivity.toModel(),
} }

10
pkg/oonimkall/session_integration_test.go
View File

@ -259,7 +259,7 @@ func TestCheckInSuccess(t *testing.T) {
Charging: true, Charging: true,
OnWiFi: true, OnWiFi: true,
Platform: "android", Platform: "android",
RunType: model.RunTypeTimed, RunType: string(model.RunTypeTimed),
SoftwareName: "ooniprobe-android", SoftwareName: "ooniprobe-android",
SoftwareVersion: "2.7.1", SoftwareVersion: "2.7.1",
WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{}, WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{},
@ -307,7 +307,7 @@ func TestCheckInLookupLocationFailure(t *testing.T) {
Charging: true, Charging: true,
OnWiFi: true, OnWiFi: true,
Platform: "android", Platform: "android",
RunType: model.RunTypeTimed, RunType: string(model.RunTypeTimed),
SoftwareName: "ooniprobe-android", SoftwareName: "ooniprobe-android",
SoftwareVersion: "2.7.1", SoftwareVersion: "2.7.1",
WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{}, WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{},
@ -337,7 +337,7 @@ func TestCheckInNewProbeServicesFailure(t *testing.T) {
Charging: true, Charging: true,
OnWiFi: true, OnWiFi: true,
Platform: "android", Platform: "android",
RunType: model.RunTypeTimed, RunType: string(model.RunTypeTimed),
SoftwareName: "ooniprobe-android", SoftwareName: "ooniprobe-android",
SoftwareVersion: "2.7.1", SoftwareVersion: "2.7.1",
WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{}, WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{},
@ -366,7 +366,7 @@ func TestCheckInCheckInFailure(t *testing.T) {
Charging: true, Charging: true,
OnWiFi: true, OnWiFi: true,
Platform: "android", Platform: "android",
RunType: model.RunTypeTimed, RunType: string(model.RunTypeTimed),
SoftwareName: "ooniprobe-android", SoftwareName: "ooniprobe-android",
SoftwareVersion: "2.7.1", SoftwareVersion: "2.7.1",
WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{}, WebConnectivity: &oonimkall.CheckInConfigWebConnectivity{},
@ -392,7 +392,7 @@ func TestCheckInNoParams(t *testing.T) {
Charging: true, Charging: true,
OnWiFi: true, OnWiFi: true,
Platform: "android", Platform: "android",
RunType: model.RunTypeTimed, RunType: string(model.RunTypeTimed),
SoftwareName: "ooniprobe-android", SoftwareName: "ooniprobe-android",
SoftwareVersion: "2.7.1", SoftwareVersion: "2.7.1",
} }