diff --git a/tests/README.md b/tests/README.md index 2f0a6b2..16c4138 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,7 +2,7 @@ ## [GO BACK](../README.md) -Tests are a quick and dirty way to check if your modification to the backend code dind't break anything. +Tests are a quick and dirty way to check if your modification to the backend code didn't break anything. # Running all the tests If you are working on the same machine firegex is running on, you can just run run_tests.sh @@ -66,7 +66,7 @@ options: --output-file OUTPUT_FILE, -o OUTPUT_FILE Output results csv file --num-of-streams NUM_OF_STREAMS, -s NUM_OF_STREAMS - Output results csv file + Number of concurrent streams --mode {netfilter,proxy}, -m {netfilter,proxy} Type of filtering ``` diff --git a/tests/benchmark.py b/tests/benchmark.py index 55b814b..62da986 100644 --- a/tests/benchmark.py +++ b/tests/benchmark.py @@ -17,7 +17,7 @@ parser.add_argument("--password", "-p", type=str, required=True, help='Firegex p parser.add_argument("--num-of-regexes", "-r", type=int, required=True, help='Number of regexes to benchmark with') parser.add_argument("--duration", "-d", type=int, required=False, help='Duration of the Benchmark in seconds', default=5) parser.add_argument("--output-file", "-o", type=str, required=False, help='Output results csv file', default="benchmark.csv") -parser.add_argument("--num-of-streams", "-s", type=int, required=False, help='Output results csv file', default=1) +parser.add_argument("--num-of-streams", "-s", type=int, required=False, help='Number of concurrent streams', default=1) args = parser.parse_args() sep() diff --git a/tests/results/Benchmark-chart.png b/tests/results/Benchmark-chart.png index ca554f2..5b1a272 100644 Binary files a/tests/results/Benchmark-chart.png and b/tests/results/Benchmark-chart.png differ diff --git a/tests/results/netfilter-4thread.csv b/tests/results/netfilter-4thread.csv deleted file mode 100644 index b92f6a1..0000000 --- a/tests/results/netfilter-4thread.csv +++ /dev/null @@ -1,51 +0,0 @@ -0,730.449 -1,423.354 -2,307.163 -3,178.303 -4,139.111 -5,102.774 -6,100.106 -7,90.722 -8,67.083 -9,74.475 -10,56.209 -11,52.584 -12,43.16 -13,44.007 -14,41.597 -15,39.327 -16,37.487 -17,35.718 -18,39.123 -19,38.705 -20,36.028 -21,29.985 -22,34.013 -23,27.12 -24,30.239 -25,25.035 -26,28.456 -27,22.972 -28,26.196 -29,21.872 -30,24.821 -31,24.202 -32,20.028 -33,19.277 -34,18.47 -35,18.062 -36,17.525 -37,16.866 -38,16.496 -39,15.975 -40,15.702 -41,16.453 -42,16.58 -43,14.644 -44,15.084 -45,14.709 -46,14.754 -47,13.849 -48,14.306 -49,13.651 -50,12.954 diff --git a/tests/results/netfilter-single.csv b/tests/results/netfilter-single.csv deleted file mode 100644 index e266fe0..0000000 --- a/tests/results/netfilter-single.csv +++ /dev/null @@ -1,51 +0,0 @@ -0,684.571 -1,437.246 -2,304.309 -3,165.995 -4,119.457 -5,119.739 -6,86.956 -7,75.407 -8,67.627 -9,74.272 -10,56.015 -11,52.046 -12,57.892 -13,44.381 -14,48.976 -15,39.528 -16,36.876 -17,35.459 -18,38.16 -19,39.09 -20,36.559 -21,26.947 -22,32.913 -23,27.321 -24,30.553 -25,27.91 -26,28.058 -27,21.006 -28,23.086 -29,18.766 -30,19.982 -31,20.54 -32,20.093 -33,19.02 -34,18.207 -35,20.907 -36,17.078 -37,16.372 -38,16.342 -39,15.942 -40,15.874 -41,16.941 -42,15.426 -43,15.551 -44,14.26 -45,15.867 -46,14.913 -47,14.164 -48,14.059 -49,13.457 -50,12.727 diff --git a/tests/results/proxy-4thread.csv b/tests/results/proxy-4thread.csv deleted file mode 100644 index ba0417d..0000000 --- a/tests/results/proxy-4thread.csv +++ /dev/null @@ -1,51 +0,0 @@ -0,769.618 -1,232.968 -2,154.656 -3,118.505 -4,97.084 -5,80.982 -6,69.532 -7,59.653 -8,56.235 -9,49.828 -10,45.603 -11,42.791 -12,39.231 -13,37.07 -14,34.347 -15,32.325 -16,33.11 -17,28.528 -18,31.477 -19,29.778 -20,27.93 -21,26.67 -22,25.907 -23,24.965 -24,20.498 -25,23.078 -26,22.077 -27,21.447 -28,20.666 -29,20.266 -30,19.219 -31,18.105 -32,14.124 -33,12.745 -34,14.128 -35,13.951 -36,13.488 -37,13.209 -38,13.084 -39,12.429 -40,12.044 -41,11.906 -42,11.261 -43,9.746 -44,10.95 -45,10.849 -46,10.203 -47,10.004 -48,8.958 -49,9.264 -50,9.757 diff --git a/tests/results/proxy-single.csv b/tests/results/proxy-single.csv deleted file mode 100644 index 8be0064..0000000 --- a/tests/results/proxy-single.csv +++ /dev/null @@ -1,51 +0,0 @@ -0,803.99 -1,207.751 -2,107.739 -3,86.386 -4,69.129 -5,57.75 -6,50.605 -7,44.745 -8,39.99 -9,36.051 -10,33.123 -11,30.457 -12,27.997 -13,26.202 -14,24.211 -15,22.663 -16,34.662 -17,19.939 -18,31.032 -19,29.072 -20,28.32 -21,27.248 -22,25.699 -23,24.453 -24,24.184 -25,22.719 -26,22.098 -27,21.046 -28,20.256 -29,19.72 -30,19.099 -31,12.525 -32,18.613 -33,10.502 -34,17.247 -35,16.858 -36,16.479 -37,16.075 -38,15.444 -39,15.381 -40,14.867 -41,14.378 -42,14.067 -43,13.679 -44,13.27 -45,13.177 -46,12.926 -47,12.72 -48,12.585 -49,12.301 -50,11.851 diff --git a/tests/results/test-firegex.xlsx b/tests/results/test-firegex.xlsx index 3158443..6592eaf 100644 Binary files a/tests/results/test-firegex.xlsx and b/tests/results/test-firegex.xlsx differ