Merge branch 'develop'

jgm1986 · Jul 28, 2015 · bed43db · bed43db
2 parents e9809ac + c40cfea
commit bed43db
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This repository contains all necessary for deploy HTTP/2 testing server or clien
 
 ## Version
 
-0.4.1
+0.4.2
 
 
 ## Installation
@@ -65,4 +65,4 @@ This repository contains a lot of tests for HTTP/2. The description about these
 
 ## License
 
-[MIT](http://opensource.org/licenses/mit-license.html)
+[MIT](http://opensource.org/licenses/mit-license.html)
diff --git a/analysis/Tests Results Template.xlsx b/analysis/Tests Results Template.xlsx
diff --git a/analysis/calculator.py b/analysis/calculator.py
diff --git a/analysis/clean_files.sh b/analysis/clean_files.sh
@@ -1,3 +1,4 @@
 rm -r data/*.dat
+rm -r data/*.mdat
 rm -r mean/*.mdat
 rm -r mean/*.png
diff --git a/analysis/statistics.py b/analysis/statistics.py
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -58,6 +58,7 @@ for (( i=0; i<${#TestFilename[@]}; i++ ))
             ms) multiplier=1000 ;;
             us) multiplier=1 ;;
             *) echo "[ERROR] Not valid unit for total test time. Received: $valueUnit"
+            	       i--
                        continue;;
         esac
         responseTime=$(echo $responseTime | grep -Po '(\d+.*\d+)')	# Deleting units from the value

diff --git a/scripts/test.list b/scripts/test.list
@@ -8,7 +8,7 @@
 #--------------------------------------------------------
 # TestName=(${TestName[@]} "/test/file_01.html")
 # TestFilename=(${TestFilename[@]} "h2c_7.2.1_$NUM_REPETI.dat")
-# TestParameter=(${TestParameter[@]} "-uvnas")
+# TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 # TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -17,14 +17,14 @@
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_01.html")
 TestFilename=(${TestFilename[@]} "h2c_Performance_01_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 01 - H2: Performance Template 01
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_01.html")
 TestFilename=(${TestFilename[@]} "h2_Performance_01_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -33,14 +33,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_02.jpg")
 TestFilename=(${TestFilename[@]} "h2c_Performance_02_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 03 - H2: Performance Template 02
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_02.jpg")
 TestFilename=(${TestFilename[@]} "h2_Performance_02_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -49,14 +49,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_03.html")
 TestFilename=(${TestFilename[@]} "h2c_Performance_03_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 05 - H2: Performance Template 03
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_03.html")
 TestFilename=(${TestFilename[@]} "h2_Performance_03_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -65,14 +65,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_04.php")
 TestFilename=(${TestFilename[@]} "h2c_Performance_04_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 07 - H2: Performance Template 04
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_04.php")
 TestFilename=(${TestFilename[@]} "h2_Performance_04_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -81,14 +81,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_05.txt")
 TestFilename=(${TestFilename[@]} "h2c_Performance_05_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 09 - H2: Performance Template 05
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_05.txt")
 TestFilename=(${TestFilename[@]} "h2_Performance_05_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -97,14 +97,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_06.html")
 TestFilename=(${TestFilename[@]} "h2c_Performance_06_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 11 - H2: Performance Template 06
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_06.html")
 TestFilename=(${TestFilename[@]} "h2_Performance_06_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -113,14 +113,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_10.html")
 TestFilename=(${TestFilename[@]} "h2c_Performance_10_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 13 - H2: Performance Template 10
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_10.html")
 TestFilename=(${TestFilename[@]} "h2_Performance_10_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 
 
@@ -129,12 +129,12 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_11.html")
 TestFilename=(${TestFilename[@]} "h2c_Performance_11_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-uvnas")
+TestParameter=(${TestParameter[@]} "-uvnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
 #--------------------------------------------------------
 # 15 - H2: Performance Template 11
 #--------------------------------------------------------
 TestName=(${TestName[@]} "/test/test_11.html")
 TestFilename=(${TestFilename[@]} "h2_Performance_11_$NUM_REPETI.dat")
-TestParameter=(${TestParameter[@]} "-vnas")
+TestParameter=(${TestParameter[@]} "-vnas -t 30")
 TestUrlPreamb=(${TestUrlPreamb[@]} "https://")