Cleaned up the tests and readme

README.md

@@ -54,20 +54,11 @@ flag run:
  ```
 
  To run all tests in fast mode and output the results to the Parsing-results
- director, run:
+ directory, run:
 
 ```
 ./run_tests_fast
 ```
-***Note that this will start 22 different processes***
-
-Once the tests have been run, tables and graphs can be generated by running:
-
-```
-./parse_results
-```
-
-
 
 Note that: our implementation is coded such that the reachability certificate expires at 00:00 UTC. A workaround has been included in each test to pause if it is too close to this time so the request won't fail. In reality, if the bucket is still reachable, a user could simply request a new reachability token if their request fails for this reason (a new certificate should be available prior to the outdated certificate expiring).
 

run_tests_fast.sh

@@ -1,27 +1,26 @@
 #!/bin/bash
 
-cargo test --release --features=fast -- --nocapture stats_test_trust_levels > trust_levels.log&
-cargo test --release --features=fast -- --nocapture stats_test_invitations > invitations.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_05 > blockage_migration_05.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_010 > blockage_migration_010.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_20 > blockage_migration_20.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_25 > blockage_migration_25.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_30 > blockage_migration_30.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_35 > blockage_migration_35.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_40 > blockage_migration_40.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_45 > blockage_migration_45.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_50 > blockage_migration_50.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_55 > blockage_migration_55.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_60 > blockage_migration_60.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_65 > blockage_migration_65.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_70 > blockage_migration_70.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_75 > blockage_migration_75.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_80 > blockage_migration_80.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_85 > blockage_migration_85.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_90 > blockage_migration_90.log&
-cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_95 > blockage_migration_95.log&
-cargo test release --features=fast -- --nocapture stats_test_percent_blockage_migration_100 > blockage_migration_100.log&
-wait
+cargo test --release --features=fast -- --nocapture stats_test_trust_levels > trust_levels.log
+cargo test --release --features=fast -- --nocapture stats_test_invitations > invitations.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_05 > blockage_migration_05.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_010 > blockage_migration_010.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_20 > blockage_migration_20.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_25 > blockage_migration_25.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_30 > blockage_migration_30.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_35 > blockage_migration_35.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_40 > blockage_migration_40.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_45 > blockage_migration_45.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_50 > blockage_migration_50.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_55 > blockage_migration_55.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_60 > blockage_migration_60.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_65 > blockage_migration_65.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_70 > blockage_migration_70.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_75 > blockage_migration_75.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_80 > blockage_migration_80.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_85 > blockage_migration_85.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_90 > blockage_migration_90.log
+cargo test --release --features=fast -- --nocapture stats_test_percent_blockage_migration_95 > blockage_migration_95.log
+cargo test release --features=fast -- --nocapture stats_test_percent_blockage_migration_100 > blockage_migration_100.log
 echo "Completed all tests, now parsing results"
 mv *.log Parsing-results
 ./parse_data.sh

src/tests.rs

@@ -16,15 +16,6 @@ const USERS: usize = 100;
 #[cfg(not(feature = "fast"))]
 const USERS: usize = 10000;
 
-/*cfg_if::cfg_if! {
-     if #[cfg(feature = "fast")]{
-         const USERS: usize = 10;
-     } else {
-         const USERS: usize = 10000;
-     }
-}
-*/
-
 struct PerfStat {
     // Report performance metrics for each test
     req_len: usize,
@@ -935,7 +926,6 @@ fn stats_test_invitations() {
 #[test]
 fn stats_test_percent_blockage_migration_05() {
     let buckets: Vec<u16> = vec![150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500];
-    println!("USERS:{}",USERS);
 
     for x in buckets {
         let mut th = TestHarness::new_buckets(x, x);