Finished tests, ready to merge

README.md

@@ -46,10 +46,6 @@ Initiially the project was based only on regex filters, and also now the main fu
 
 # TODO:
 
-## Until merge of dev branch to main
-
-- Fix/Improve Benchmark && Benchmark readme
-
 ## Next points
 
 - Create hijacking port to proxy

tests/README.md

@@ -6,9 +6,12 @@ Tests are a quick and dirty way to check if your modification to the backend cod
 
 # Running all the tests
 If you are working on the same machine firegex is running on, you can just run run_tests.sh
+```bash
 $ ./run_tests.sh
+```
 It will automatically perform a general API test, Netfilter and Proxy Regex test. 
 You can also run tests manually:
+```bash
 $ ./api_test.py -h
 usage: api_test.py [-h] [--address ADDRESS] --password PASSWORD
 
@@ -41,8 +44,9 @@ You can also run tests manually:
 --service_name SERVICE_NAME, -n SERVICE_NAME
                         Name of the test service
 --port PORT, -P PORT  Port of the test service
-
+```
 # Running a Benchmark
+```bash
 ./benchmark.py
 options:
 -h, --help            show this help message and exit
@@ -65,20 +69,19 @@ You can also run tests manually:
                         Output results csv file
 --mode {netfilter,proxy}, -m {netfilter,proxy}
                         Type of filtering
-
+```
 Benchmarks let you evaluate the performance of the filters. You can run one by typing in a shell  ```test.py -p FIREGEX_PASSWORD -r NUM_OF_REGEX -d BENCHMARK_DURATION -m proxy``` to benchmark the Proxy based regex filter, or ``` -m netfilter ``` to benchmark the Netfilter based regex filtering.
 It uses iperf3 to benchmark the throughput in MB/s of the server, both with filters, without filters, and for each new added regex. It will automatically add a new random regex untill it has reached NUM_OF_REGEX specified in the arguments. 
 
 You will find a new benchmark.csv file containg the results.
 
 # Firegex Performance Results
-TODO: Update with new graphs
 
 The test was performed on:
-- AMD Ryzen 7 3700X (16 thread) @ 3.600GHz
-- RAM Speed: 3200 MT/s (Dual Channel)
-- Kernel: 5.18.5-arch1-1
+- Bedrock Linux 0.7.27 Poki x86_64
+- Intel i5-7200U (4) @ 3.100GHz
+- 8GB RAM DDR4 2133 MT/s
 
-Command: `python3 benchmark.py -r 100 -d 1 -s 50`
+Command: `./benchmark.py -p testpassword -r 50 -d 1 -s 60`
 
-![Firegex Benchmark](/docs/FiregexBenchmark.png)
+![Firegex Benchmark](results/Benchmark-chart.png)

tests/results/.~lock.netfilter-single.csv#

@@ -1 +0,0 @@
-,nik,nik-deb,03.08.2022 12:06,file:///home/nik/.config/libreoffice/4;