Skip to content

Commit 177fa7d

Browse files
authored
Merge pull request #122 from GoASTScanner/testfixes
Correct bad test cases and intermitent failure
2 parents 5c302fb + 622440f commit 177fa7d

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

filelist.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package main
1616

1717
import (
18+
"sort"
1819
"strings"
1920

2021
"github.com/ryanuber/go-glob"
@@ -41,6 +42,7 @@ func (f *fileList) String() string {
4142
for p := range f.patterns {
4243
ps = append(ps, p)
4344
}
45+
sort.Strings(ps)
4446
return strings.Join(ps, ", ")
4547
}
4648

filelist_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ func Test_fileList_String(t *testing.T) {
6565
},
6666
{
6767
name: "two patterns",
68-
fields: fields{patterns: []string{"foo", "bar"}},
69-
want: "foo, bar",
68+
fields: fields{patterns: []string{"bar", "foo"}},
69+
want: "bar, foo",
7070
},
7171
}
7272
for _, tt := range tests {

rules/blacklist_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package main
2222
import (
2323
_ "crypto/md5"
2424
"fmt"
25+
"os"
2526
)
2627
func main() {
2728
for _, arg := range os.Args {

rules/nosec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestNosecBlock(t *testing.T) {
4949
`package main
5050
import (
5151
"os"
52-
"os/exect"
52+
"os/exec"
5353
)
5454
5555
func main() {

rules/sql_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ func TestSQLInjectionFalsePositiveA(t *testing.T) {
8989
package main
9090
import (
9191
"database/sql"
92-
"fmt"
93-
"os"
9492
//_ "github.com/mattn/go-sqlite3"
9593
)
9694
@@ -125,8 +123,6 @@ func TestSQLInjectionFalsePositiveB(t *testing.T) {
125123
package main
126124
import (
127125
"database/sql"
128-
"fmt"
129-
"os"
130126
//_ "github.com/mattn/go-sqlite3"
131127
)
132128
@@ -161,8 +157,6 @@ func TestSQLInjectionFalsePositiveC(t *testing.T) {
161157
package main
162158
import (
163159
"database/sql"
164-
"fmt"
165-
"os"
166160
//_ "github.com/mattn/go-sqlite3"
167161
)
168162
@@ -197,8 +191,6 @@ func TestSQLInjectionFalsePositiveD(t *testing.T) {
197191
package main
198192
import (
199193
"database/sql"
200-
"fmt"
201-
"os"
202194
//_ "github.com/mattn/go-sqlite3"
203195
)
204196

0 commit comments

Comments
 (0)