Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
[report]
omit =
*/synapse/tests/test_*

; Uncomment this section to enable code coverage of storm files in the
; storm_dirs directory listed below. This is disabled by default right now
; because it's pretty intensive and imposes a large perf hit on the already slow
; tests.
;[run]
;plugins = synapse.utils.stormcov

[synapse.utils.stormcov]
storm_dirs = synapse/assets/storm
2 changes: 0 additions & 2 deletions synapse/lib/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ def funccall(self, meta, kids):
argkids = []
kwargkids = []
kwnames = set()
indx = 1
kcnt = len(kids)

todo = collections.deque(kids)

Expand Down
2 changes: 2 additions & 0 deletions synapse/tests/files/stormcov/argvquery.storm
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ function foo() {
} {}
}
yield $foo()
// coverage: 1, 2, 3, 4, 6, 8
// lines: 1, 2, 3, 4, 8
4 changes: 4 additions & 0 deletions synapse/tests/files/stormcov/argvquery2.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

tee { inet:fqdn=argvquery2.storm }
// coverage: 2
// lines: 2
6 changes: 6 additions & 0 deletions synapse/tests/files/stormcov/argvquery3.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

tee {
inet:fqdn=argvquery3.storm
}
// coverage: 2, 3
// lines: 2, 3
7 changes: 7 additions & 0 deletions synapse/tests/files/stormcov/argvquery4.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

tee
{
inet:fqdn=argvquery4.storm
}
// coverage: 2, 3, 4
// lines: 2, 4
11 changes: 11 additions & 0 deletions synapse/tests/files/stormcov/argvquery5.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

tee
{


inet:fqdn=argvquery5.storm


}
// coverage: 2, 3, 6
// lines: 2, 6
1 change: 1 addition & 0 deletions synapse/tests/files/stormcov/badstorm.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{}]
24 changes: 20 additions & 4 deletions synapse/tests/files/stormcov/dupesubs.storm
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
$eq = ${ [inet:fqdn=bar.com] }
$eq = ${ [inet:fqdn=bar.com] }
$eq = ${
[inet:fqdn=bar.com]
}
$eq = ${
[inet:fqdn=bar.com]
}
tee {
[inet:fqdn=foo.com]
} { [inet:fqdn=baz.com ] }
$eq

|
tee {
[inet:fqdn=argv.com]
if (false) {
[inet:fqdn=argv.com]
}
} {
[inet:fqdn=argv.com]
}
|
tee
{
[ inet:fqdn=dup00.com ]
}
{
[ inet:fqdn=dup00.com ]
}
// coverage: 1, 2, 4, 7, 8, 9, 10, 12, 13, 16, 17, 20, 21, 22, 24
// lines: 1, 2, 4, 5, 7, 8, 9, 10, 12, 13, 14, 17, 20, 22, 25
39 changes: 39 additions & 0 deletions synapse/tests/files/stormcov/dupewarn.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
tee ${ inet:fqdn=01.embed.dupewarn.com } ${ inet:fqdn=01.embed.dupewarn.com }
|
tee ${
[ inet:fqdn=00.embed.dupewarn.com ]
}
${


[ inet:fqdn=00.embed.dupewarn.com ]


}
|
tee
${ inet:fqdn=02.embed.dupewarn.com }
${
inet:fqdn=02.embed.dupewarn.com
}
// embddups: 1:1, 6:3, 16:15
|
tee {
[ inet:fqdn=00.argv.dupewarn.com ]
}
{


[ inet:fqdn=00.argv.dupewarn.com ]


}
|
tee { inet:fqdn=01.argv.dupewarn.com } { inet:fqdn=01.argv.dupewarn.com }
|
tee
{ inet:fqdn=02.argv.dupewarn.com }
{
inet:fqdn=02.argv.dupewarn.com
}
// argvdups: 24:21, 32:32, 36:35
21 changes: 21 additions & 0 deletions synapse/tests/files/stormcov/embedquery.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
$eq1 = ${
[ inet:fqdn=vertex.link ]
}
$eq2 = ${
if (true) {
[ inet:fqdn=vertex.link ]
}
}
$eq3 = ${
if (false) {
[ inet:fqdn=vertex.link ]
}
}
$eq4 = ${ [ inet:fqdn=vtx.lk ] }
$eq5 = ${

[ inet:fqdn=v.vtx.lk ]
}
tee $eq1 $eq2 $eq3 $eq4 $eq5
// coverage: 1, 2, 4, 5, 6, 9, 10, 14, 15, 17, 19
// lines: 1, 2, 4, 5, 6, 9, 10, 11, 14, 15, 17, 19
4 changes: 4 additions & 0 deletions synapse/tests/files/stormcov/embedquery2.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

tee ${ inet:fqdn=embedquery2.storm }
// coverage: 2
// lines: 2
6 changes: 6 additions & 0 deletions synapse/tests/files/stormcov/embedquery3.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

tee ${
inet:fqdn=embedquery3.storm
}
// coverage: 2, 3
// lines: 2, 3
7 changes: 7 additions & 0 deletions synapse/tests/files/stormcov/embedquery4.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

tee
${
inet:fqdn=embedquery4.storm
}
// coverage: 2, 3, 4
// lines: 2, 4
11 changes: 11 additions & 0 deletions synapse/tests/files/stormcov/embedquery5.storm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

tee
${


inet:fqdn=embedquery5.storm


}
// coverage: 2, 3, 6
// lines: 2, 6
1 change: 1 addition & 0 deletions synapse/tests/files/stormcov/lookup.storm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ function foo() {
}
yield $foo()
yield $foo()
// lines: 1, 2, 3, 5, 6
2 changes: 2 additions & 0 deletions synapse/tests/files/stormcov/pivot.storm
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[inet:fqdn=vertex.link]
-> inet:fqdn
// coverage: 1, 2
// lines: 1, 2
2 changes: 2 additions & 0 deletions synapse/tests/files/stormcov/pragma-nocov.storm
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ function foo() {
} // pragma: no cover stop
}
yield $foo()
// coverage: 1, 2, 3, 18
// lines: 1, 2, 3, 12, 18
2 changes: 2 additions & 0 deletions synapse/tests/files/stormcov/spin.storm
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

[inet:fqdn=vertex.link]
spin
// coverage: 2, 3
// lines: 2, 3
2 changes: 2 additions & 0 deletions synapse/tests/files/stormcov/stormctrl.storm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ function foo() {
}
}
yield $foo()
// coverage: 1, 2, 3, 6
// lines: 1, 2, 3, 6
Loading