github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-22 14:24:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

session: Environment.GetInt() swap error returns

Browse source
This commit is contained in:
Lars Lehtonen 2019-11-25 04:25:12 -08:00
commit fbc34742bc
No known key found for this signature in database
GPG key ID: 8137D474EBCB04F2
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
session/environment.go
View file

@ -113,16 +113,16 @@ func (env *Environment) Get(name string) (bool, string) {
return env.GetUnlocked(name) return env.GetUnlocked(name)
} }
func (env *Environment) GetInt(name string) (error, int) { func (env *Environment) GetInt(name string) (int, error) {
if found, value := env.Get(name); found { if found, value := env.Get(name); found {
if i, err := strconv.Atoi(value); err == nil { if i, err := strconv.Atoi(value); err == nil {
return nil, i return i, nil
} else { } else {
return err, 0 return 0, err
} }
} }
return fmt.Errorf("Not found."), 0 return 0, fmt.Errorf("Not found.")
} }
func (env *Environment) Sorted() []string { func (env *Environment) Sorted() []string {

6
session/environment_test.go
View file

@ -252,19 +252,19 @@ func TestSessionEnvironmentGetInt(t *testing.T) {
} }
for k := range testEnvData { for k := range testEnvData {
if err, _ := env.GetInt(k); err == nil { if _, err := env.GetInt(k); err == nil {
t.Fatal("expected error") t.Fatal("expected error")
} }
} }
env.Data["num"] = "1234" env.Data["num"] = "1234"
if err, i := env.GetInt("num"); err != nil { if i, err := env.GetInt("num"); err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} else if i != 1234 { } else if i != 1234 {
t.Fatalf("unexpected integer: %d", i) t.Fatalf("unexpected integer: %d", i)
} }
if err, _ := env.GetInt("unknownint"); err == nil { if _, err := env.GetInt("unknownint"); err == nil {
t.Fatalf("expected error (unknown key): %v", err) t.Fatalf("expected error (unknown key): %v", err)
} }
} }