Merge pull request #1606 from theopolis/flaky_tests

Mark flaky integration tests
This commit is contained in:
Teddy Reed 2015-10-28 17:54:03 -07:00
commit c25d75386a
2 changed files with 5 additions and 1 deletions

View File

@ -4,4 +4,5 @@ argparse
# needed for integration tests
pexpect
thrift
thrift
flaky

View File

@ -12,6 +12,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import flaky
import glob
import os
import psutil
@ -239,6 +240,7 @@ class ExtensionTests(test_base.ProcessGenerator, unittest.TestCase):
client.close()
daemon.kill(True)
@flaky.flaky(max_runs=3)
def test_7_extensions_autoload_watchdog(self):
loader = test_base.Autoloader(
[test_base.ARGS.build + "/osquery/example_extension.ext"])
@ -260,6 +262,7 @@ class ExtensionTests(test_base.ProcessGenerator, unittest.TestCase):
client.close()
daemon.kill(True)
@flaky.flaky(max_runs=3)
def test_8_external_config(self):
loader = test_base.Autoloader(
[test_base.ARGS.build + "/osquery/example_extension.ext"])