Skip to content

Fix for stress test and dhcp test #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwsGonzo merged 5 commits into from
Oct 6, 2016
Merged

Fix for stress test and dhcp test #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9351ded
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev
mnordsletten Sep 15, 2016
768fcd0
Merge branch 'master' of https://github.com/hioa-cs/IncludeOS into dev
mnordsletten Oct 6, 2016
789c084
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev
mnordsletten Oct 6, 2016
334f54e
stress: Increased the allowed page increase
mnordsletten Oct 6, 2016
66663be
dhcp test: Added sleep to prevent bug in dhcp test
mnordsletten Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/net/integration/dhcp/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import sys
import os
import time
import subprocess

includeos_src = os.environ.get('INCLUDEOS_SRC',
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/stress/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down