Description: Lower number used to not overflow on 32bit arches. This is not a proper fix, but at least allows tests to pass on 32bit arches until upstream properly fixes the int overflow. Author: Unit 193 , Nicolas Schier Bug: https://github.com/xanzy/go-gitlab/issues/880 Forwarded: not-needed --- event_webhook_types_test.go | 2 +- plan_limits_test.go | 34 +++++++++++++++++----------------- testdata/webhooks/job.json | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) --- a/plan_limits_test.go +++ b/plan_limits_test.go @@ -29,13 +29,13 @@ func TestGetCurrentPlanLimits(t *testing mux.HandleFunc("/api/v4/application/plan_limits", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodGet) fmt.Fprintf(w, `{ - "conan_max_file_size": 3221225472, - "generic_packages_max_file_size": 5368709120, + "conan_max_file_size": 2147483647, + "generic_packages_max_file_size": 2147483647, "helm_max_file_size": 5242880, - "maven_max_file_size": 3221225472, + "maven_max_file_size": 2147483647, "npm_max_file_size": 524288000, "nuget_max_file_size": 524288000, - "pypi_max_file_size": 3221225472, + "pypi_max_file_size": 2147483647, "terraform_module_max_file_size": 1073741824 }`) }) @@ -49,13 +49,13 @@ func TestGetCurrentPlanLimits(t *testing } want := &PlanLimit{ - ConanMaxFileSize: 3221225472, - GenericPackagesMaxFileSize: 5368709120, + ConanMaxFileSize: 2147483647, + GenericPackagesMaxFileSize: 2147483647, HelmMaxFileSize: 5242880, - MavenMaxFileSize: 3221225472, + MavenMaxFileSize: 2147483647, NPMMaxFileSize: 524288000, NugetMaxFileSize: 524288000, - PyPiMaxFileSize: 3221225472, + PyPiMaxFileSize: 2147483647, TerraformModuleMaxFileSize: 1073741824, } @@ -70,20 +70,20 @@ func TestChangePlanLimits(t *testing.T) mux.HandleFunc("/api/v4/application/plan_limits", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodPut) fmt.Fprintf(w, `{ - "conan_max_file_size": 3221225472, - "generic_packages_max_file_size": 5368709120, + "conan_max_file_size": 2147483647, + "generic_packages_max_file_size": 2147483647, "helm_max_file_size": 5242880, - "maven_max_file_size": 3221225472, + "maven_max_file_size": 2147483647, "npm_max_file_size": 524288000, "nuget_max_file_size": 524288000, - "pypi_max_file_size": 3221225472, + "pypi_max_file_size": 2147483647, "terraform_module_max_file_size": 1073741824 }`) }) opt := &ChangePlanLimitOptions{ PlanName: Ptr("default"), - ConanMaxFileSize: Ptr(3221225472), + ConanMaxFileSize: Ptr(2147483647), } planlimit, _, err := client.PlanLimits.ChangePlanLimits(opt) if err != nil { @@ -91,13 +91,13 @@ func TestChangePlanLimits(t *testing.T) } want := &PlanLimit{ - ConanMaxFileSize: 3221225472, - GenericPackagesMaxFileSize: 5368709120, + ConanMaxFileSize: 2147483647, + GenericPackagesMaxFileSize: 2147483647, HelmMaxFileSize: 5242880, - MavenMaxFileSize: 3221225472, + MavenMaxFileSize: 2147483647, NPMMaxFileSize: 524288000, NugetMaxFileSize: 524288000, - PyPiMaxFileSize: 3221225472, + PyPiMaxFileSize: 2147483647, TerraformModuleMaxFileSize: 1073741824, } --- a/event_webhook_types_test.go +++ b/event_webhook_types_test.go @@ -125,7 +125,7 @@ func TestJobEventUnmarshal(t *testing.T) Tag: false, BeforeSHA: "0000000000000000000000000000000000000000", SHA: "95d49d1efbd941908580e79d65e4b5ecaf4a8305", - BuildID: 3580121225, + BuildID: 2147483647, BuildName: "auto_deploy:start", BuildStage: "coordinated:tag", BuildStatus: "success", --- a/testdata/webhooks/job.json +++ b/testdata/webhooks/job.json @@ -4,7 +4,7 @@ "tag": false, "before_sha": "0000000000000000000000000000000000000000", "sha": "95d49d1efbd941908580e79d65e4b5ecaf4a8305", - "build_id": 3580121225, + "build_id": 2147483647, "build_name": "auto_deploy:start", "build_stage": "coordinated:tag", "build_status": "success",