Coverage

- Add more coverage tests

Author: jelu

tests/broken.xml

@@ -0,0 +1,3 @@
+<dscdata>
+<array name="pcap_stats" dimensions="2" start_time="1563520560" stop_time="1563520620">
+  <dimension number="1" type="ifname"

tests/coverage.sh

@@ -1,12 +1,14 @@
-#!/bin/sh -xe
+#!/bin/sh
+
+set -xe
 
 base=`dirname $0`
 
 export PATH="$base:$PATH"
 
 "$base/test.sh"
 
-dsc-datatool \
+! dsc-datatool \
   -vvv \
   -s test-server \
   -n test-node \
@@ -20,14 +22,13 @@ dsc-datatool \
   --transform ";NetRemap;client_subnet,client_subnet2,client_addr_vs_rcode,ipv6_rsn_abusers;net=16" \
   --generator ";client_subnet_authority;csv=$base/ipv4-address-space.csv;csv=$base/ipv6-unicast-address-assignments.csv" \
   --generator ";client_subnet_country;path=$HOME/GeoIP" \
-  --xml "$base/1563520620.dscdata.xml" >/dev/null
+  --xml "$base" >/dev/null
 
 dsc-datatool \
   -vvv \
   -s test-server \
   -n test-node \
   --output ";InfluxDB;dml=1;database=dsc" \
-  --transform ";Labler;*;yaml=$base/labler.yaml" \
   --transform ";ReRanger;rcode_vs_replylen;range=/64;pad_to=5" \
   --transform ";ReRanger;qtype_vs_qnamelen;range=/16;pad_to=3" \
   --transform ";ReRanger;client_port_range;key=low;range=/2048;pad_to=5" \
@@ -37,3 +38,13 @@ dsc-datatool \
   --generator ";client_subnet_authority;csv=$base/ipv4-address-space.csv;csv=$base/ipv6-unicast-address-assignments.csv" \
   --generator ";client_subnet_country;path=$HOME/GeoIP" \
   --dat "$base/20190719" >/dev/null
+
+dsc-datatool -vvvvvvv --list >/dev/null
+! dsc-datatool -s test -n test --output ";InfluxDB;test=a;test=b;test=c" >/dev/null
+! dsc-datatool -s test -n test --generator does_not_exist >/dev/null
+! dsc-datatool -s test -n test --generator does_not_exist,really_does_not_exist >/dev/null
+! dsc-datatool -s test -n test --transform ";does_not_exist;*" >/dev/null
+! dsc-datatool -s test -n test --transform ";ReRanger;a,a,a;range=/8" >/dev/null
+! dsc-datatool -s test -n test --output does_not_exists >/dev/null
+! dsc-datatool -s test -n test --dataset a --dataset b --dataset c,d,e >/dev/null
+! dsc-datatool -s test -n test --dat "$base/coverage.sh" >/dev/null

tests/dsc-datatool

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
 base=`dirname $0`
-export PYTHONPATH="$base/.."
+export PYTHONPATH="$base/..:$PYTHONPATH"
 
 exec python3-coverage run -a "$base/dsc-datatool.py" "$@"

tests/dsc-datatool.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
+import sys
 from dsc_datatool import main
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())

tests/test_objects.py

@@ -15,7 +15,7 @@ def test_dimension():
 def test_input():
     o = Input()
     with pytest.raises(Exception):
-        o.process()
+        o.process("test")
 
     class Input1(Input):
         def process(self, file):
@@ -29,7 +29,7 @@ def process(self, file):
 def test_output():
     o = Output({})
     with pytest.raises(Exception):
-        o.process()
+        o.process([])
 
     class Output1(Output):
         def process(self, file):
@@ -43,7 +43,7 @@ def process(self, file):
 def test_generator():
     o = Generator({})
     with pytest.raises(Exception):
-        o.process()
+        o.process([])
 
     class Generator1(Generator):
         def process(self, file):
@@ -57,7 +57,7 @@ def process(self, file):
 def test_transformer():
     o = Transformer({})
     with pytest.raises(Exception):
-        o.process()
+        o.process([])
 
     class Transformer1(Transformer):
         def process(self, file):