Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix:(issue_1962) Fix tests failing on 32 bit architectures #1963

Merged
merged 2 commits into from
Aug 11, 2024
Merged

Fix:(issue_1962) Fix tests failing on 32 bit architectures #1963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd87fe5
Fix:(issue_1962) Fix tests failing on 32 bit architectures
dearchap Aug 11, 2024
2a37495
uintt64 -> unint64
dearchap Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions altsrc/yaml_file_loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package altsrc_test
import (
"errors"
"fmt"
"io/ioutil"
"log"
"os"
"testing"
Expand Down Expand Up @@ -90,7 +89,7 @@ func ExampleApp_Run_yamlFileLoaderDuration() {
}

func TestYamlFileInt64Slice(t *testing.T) {
_ = ioutil.WriteFile("current.yaml", []byte(`top:
_ = os.WriteFile("current.yaml", []byte(`top:
test: [100, 9223372036854775808]`), 0666)
defer os.Remove("current.yaml")

Expand All @@ -110,7 +109,7 @@ func TestYamlFileInt64Slice(t *testing.T) {
}

func TestYamlFileStringSlice(t *testing.T) {
_ = ioutil.WriteFile("current.yaml", []byte(`top:
_ = os.WriteFile("current.yaml", []byte(`top:
test: ["s1", "s2"]`), 0666)
defer os.Remove("current.yaml")

Expand Down Expand Up @@ -143,7 +142,7 @@ func TestYamlFileUint64(t *testing.T) {
}{
{
"top.test",
`top:
`top:
test: 100`,
false,
},
Expand Down Expand Up @@ -180,7 +179,7 @@ func TestYamlFileUint64(t *testing.T) {
}

for i, test := range tests {
_ = ioutil.WriteFile("current.yaml", []byte(test.entry), 0666)
_ = os.WriteFile("current.yaml", []byte(test.entry), 0666)
defer os.Remove("current.yaml")

testFlag := []cli.Flag{
Expand All @@ -207,7 +206,7 @@ func TestYamlFileUint(t *testing.T) {
}{
{
"top.test",
`top:
`top:
test: 100`,
false,
},
Expand All @@ -228,12 +227,12 @@ func TestYamlFileUint(t *testing.T) {
},
{
"test",
"test: 9223372036854775807", //int
"test: 775807", //int
false,
},
{
"test",
"test: 9223372036854775808", //uintt64
"test: 4775808", //uintt64
dearchap marked this conversation as resolved.
Show resolved Hide resolved
false,
},
{
Expand All @@ -244,7 +243,7 @@ func TestYamlFileUint(t *testing.T) {
}

for i, test := range tests {
_ = ioutil.WriteFile("current.yaml", []byte(test.entry), 0666)
_ = os.WriteFile("current.yaml", []byte(test.entry), 0666)
defer os.Remove("current.yaml")

testFlag := []cli.Flag{
Expand All @@ -271,7 +270,7 @@ func TestYamlFileInt64(t *testing.T) {
}{
{
"top.test",
`top:
`top:
test: 100`,
false,
},
Expand Down Expand Up @@ -308,7 +307,7 @@ func TestYamlFileInt64(t *testing.T) {
}

for i, test := range tests {
_ = ioutil.WriteFile("current.yaml", []byte(test.entry), 0666)
_ = os.WriteFile("current.yaml", []byte(test.entry), 0666)
defer os.Remove("current.yaml")

testFlag := []cli.Flag{
Expand Down
10 changes: 5 additions & 5 deletions flag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func TestFlagsFromEnv(t *testing.T) {
{"1", 1, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, ""},
{"08", 8, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 10}, ""},
{"755", 493, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 8}, ""},
{"deadBEEF", 3735928559, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"dBEEF", 900847, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"08", 0, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 0}, `could not parse "08" as int value from environment variable "SECONDS" for flag seconds: .*`},
{"1.2", 0, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "1.2" as int value from environment variable "SECONDS" for flag seconds: .*`},
{"foobar", 0, &IntFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "foobar" as int value from environment variable "SECONDS" for flag seconds: .*`},
Expand Down Expand Up @@ -233,15 +233,15 @@ func TestFlagsFromEnv(t *testing.T) {
{"1", uint(1), &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, ""},
{"08", uint(8), &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 10}, ""},
{"755", uint(493), &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 8}, ""},
{"deadBEEF", uint(3735928559), &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"dBEEF", uint(900847), &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"08", 0, &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 0}, `could not parse "08" as uint value from environment variable "SECONDS" for flag seconds: .*`},
{"1.2", 0, &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "1.2" as uint value from environment variable "SECONDS" for flag seconds: .*`},
{"foobar", 0, &UintFlag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "foobar" as uint value from environment variable "SECONDS" for flag seconds: .*`},

{"1", uint64(1), &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}}, ""},
{"08", uint64(8), &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 10}, ""},
{"755", uint64(493), &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 8}, ""},
{"deadBEEF", uint64(3735928559), &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"dBEEF", uint64(900847), &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 16}, ""},
{"08", 0, &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}, Base: 0}, `could not parse "08" as uint64 value from environment variable "SECONDS" for flag seconds: .*`},
{"1.2", 0, &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "1.2" as uint64 value from environment variable "SECONDS" for flag seconds: .*`},
{"foobar", 0, &Uint64Flag{Name: "seconds", EnvVars: []string{"SECONDS"}}, `could not parse "foobar" as uint64 value from environment variable "SECONDS" for flag seconds: .*`},
Expand Down Expand Up @@ -1489,8 +1489,8 @@ var uintSliceFlagTests = []struct {
}{
{"heads", nil, NewUintSlice(), "--heads value [ --heads value ]\t"},
{"H", nil, NewUintSlice(), "-H value [ -H value ]\t"},
{"heads", []string{"H"}, NewUintSlice(uint(2), uint(17179869184)),
"--heads value, -H value [ --heads value, -H value ]\t(default: 2, 17179869184)"},
{"heads", []string{"H"}, NewUintSlice(uint(2), uint(79869184)),
"--heads value, -H value [ --heads value, -H value ]\t(default: 2, 79869184)"},
}

func TestUintSliceFlagHelpOutput(t *testing.T) {
Expand Down