senaduka/old-vegeta
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from Sirupsen/target-comments

Browse Source 
Add handling of comments in targets.txt
This commit is contained in:
Tomás Senart
2013-08-21 11:23:05 -07:00
parent 4f568b9ace 1dadca892a
commit 9b730ca77a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/targets.go
View File

@@ -29,10 +29,10 @@ func readTargets(source io.Reader) (Targets, error) {
lines := make([]string, 0) lines := make([]string, 0)
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
if line = strings.TrimSpace(line); line == "" { // Empty line
continue if line = strings.TrimSpace(line); line != "" && line[0:2] != "//" { // A comment or blank line
lines = append(lines, line)
} }
lines = append(lines, line)
} }
if err := scanner.Err(); err != nil { if err := scanner.Err(); err != nil {
return Targets{}, err return Targets{}, err

2
lib/targets_test.go
View File

@@ -7,7 +7,7 @@ import (
) )
func TestReadTargets(t *testing.T) { func TestReadTargets(t *testing.T) {
lines := bytes.NewBufferString("GET http://lolcathost:9999/\n\nHEAD http://lolcathost:9999/\n") lines := bytes.NewBufferString("GET http://lolcathost:9999/\n\n // HEAD http://lolcathost.com this is a comment \nHEAD http://lolcathost:9999/\n")
targets, err := readTargets(lines) targets, err := readTargets(lines)
if err != nil { if err != nil {
t.Fatalf("Couldn't parse valid source: %s", err) t.Fatalf("Couldn't parse valid source: %s", err)