network: fixing network tests
authorAdam Turowski <adam.turowski@inf.ethz.ch>
Thu, 3 Nov 2016 13:01:02 +0000 (14:01 +0100)
committerAdam Turowski <adam.turowski@inf.ethz.ch>
Thu, 3 Nov 2016 13:01:02 +0000 (14:01 +0100)
Signed-off-by: Adam Turowski <adam.turowski@inf.ethz.ch>

tools/harness/siteconfig/eth.py
tools/harness/tests/webserver.py
usr/webserver/http_server.c

index f2ca2e8..9629fd5 100644 (file)
@@ -30,7 +30,7 @@ class ETH(siteconfig.BaseSite):
     HTTPERF_MAXCLIENTS = len(LOADGEN_HOSTS * 2) # max number of load generators
     IPBENCH_PATH = '/home/netos/tools/ipbench/bin/ipbench.py'
     IPBENCHD_PATH = '/home/netos/tools/ipbench/bin/ipbenchd.py'
-    SSH_ARGS='-x -o StrictHostKeyChecking=no -o ControlPath=none'
+    SSH_ARGS='-x -o StrictHostKeyChecking=no -o ControlPath=none -p 8006'
     HAGFISH_LOCATION='/home/netos/tftpboot/Hagfish.efi'
 
     def __init__(self):
index f9f472b..6e6338f 100644 (file)
@@ -13,12 +13,7 @@ from common import TestCommon, TimeoutError, select_timeout
 from results import ResultsBase, PassFailResult, RowResults
 
 
-WEBSERVER_TEST_FILES=['index.html', 'barrelfish.gif', 'barrelfish_sosp09.pdf']
-WEBSERVER_TEST_FILES=['index.html', 'bigfile.bz2', 'bigfile.2.bz2', 'nevill-master-capabilities.pdf']
-WEBSERVER_TEST_FILES=['nevill-master-capabilities.pdf']
-WEBSERVER_TEST_FILES=['index.html']
-
-#'razavi-master-performanceisolation.pdf']
+WEBSERVER_TEST_FILES=['index.html', 'barrelfish.gif', 'barrelfish_sosp09.pdf', 'nevill-master-capabilities.pdf', 'razavi-master-performanceisolation.pdf']
 
 WEBSERVER_TIMEOUT=5 # seconds
 TEST_LOG_NAME = 'testlog.txt'
@@ -217,8 +212,8 @@ class WebserverTest(WebCommon):
             elif passed != False and re.match('Test:.*PASS$', line):
                 passed = True
         testlog.close()
-        server_fail = super(WebserverTest, self).passed()
-        return PassFailResult(passed and not server_fail)
+        server_ok = super(WebserverTest, self).passed()
+        return PassFailResult(passed and server_ok)
 
 
 @tests.add_test
index a374b09..af58a67 100644 (file)
@@ -593,7 +593,6 @@ static void realinit(void)
     printf("HTTP setup time %"PU"\n", in_seconds(get_time_delta(&ts)));
     printf("#######################################################\n");
     printf("Starting webserver\n");
-    printf("#################### Starting webserver ##############\n");
     printf("#######################################################\n");
 
 }