Merge pull request #851 from mnordsletten/dev

Fix for stress test and dhcp test

Author: fwsGonzo

test/net/integration/dhcp/test.py

@@ -2,6 +2,7 @@
 
 import sys
 import os
+import time
 import subprocess
 
 includeos_src = os.environ.get('INCLUDEOS_SRC',
@@ -23,6 +24,7 @@ def DHCP_test():
   ip_string = vm.readline()
   print "<Test.py> Assigned address: ", ip_string
   print "<Test.py> Trying to ping"
+  time.sleep(1)
   try:
     command = ["ping", ip_string.rstrip(), "-c", str(ping_count), "-i", "0.2"]
     print color.DATA(" ".join(command))

test/stress/test.py

@@ -30,7 +30,7 @@
 
 # It's to be expected that the VM allocates more room during the running of tests
 # e.g. for containers, packets etc. These should all be freed after a run.
-acceptable_increase = 2 * PAGE_SIZE
+acceptable_increase = 12 * PAGE_SIZE
 
 # A persistent connection to the VM for getting memory info
 # TODO: This should be expanded to check more vital signs, such as time of day,