Merge pull request #898 from anarkiwi/master

jitter test startup further.
faucetsdn · Aug 28, 2017 · ce8b4d9 · ce8b4d9
2 parents cabc51c + a6bcf72
commit ce8b4d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tests/faucet_mininet_test.py b/tests/faucet_mininet_test.py
@@ -373,7 +373,7 @@ def expand_tests(requested_test_classes, excluded_test_classes,
     sanity_test_suites = []
     single_test_suites = []
     parallel_test_suites = []
-    max_loadavg = multiprocessing.cpu_count()
+    max_loadavg = multiprocessing.cpu_count() + 1
 
     for test_name, test_obj in inspect.getmembers(sys.modules[__name__]):
         if not inspect.isclass(test_obj):

diff --git a/tests/faucet_mininet_test_base.py b/tests/faucet_mininet_test_base.py
@@ -224,6 +224,7 @@ def setUp(self):
                 self.ports_sock, self._test_name())
 
         self._write_controller_configs()
+        self._wait_load()
 
     def tearDown(self):
         """Clean up after a test."""