diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-11-29 03:13:08 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-11-29 03:13:08 +0100 |
| commit | f02da6448d6c99d39ebe24623f3584e80f52806e (patch) | |
| tree | d8ebe3d5cd821e2df8d0140d5e438c9fafe65fdd | |
| parent | bb62f5f3f5283df5ce20a1136a7b3b60d5916653 (diff) | |
| download | mitmproxy-f02da6448d6c99d39ebe24623f3584e80f52806e.tar.gz mitmproxy-f02da6448d6c99d39ebe24623f3584e80f52806e.tar.bz2 mitmproxy-f02da6448d6c99d39ebe24623f3584e80f52806e.zip | |
disable concurrency tests on appveyor
| -rw-r--r-- | test/scripts/concurrent_decorator.py | 2 | ||||
| -rw-r--r-- | test/test_script.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/scripts/concurrent_decorator.py b/test/scripts/concurrent_decorator.py index 913d4484..f6feda1d 100644 --- a/test/scripts/concurrent_decorator.py +++ b/test/scripts/concurrent_decorator.py @@ -14,7 +14,7 @@ def serverconnect(context, sc): @concurrent def request(context, flow): - time.sleep(0.5) + time.sleep(0.1) @concurrent diff --git a/test/test_script.py b/test/test_script.py index 39b216fb..b2bb33b9 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -62,6 +62,7 @@ def test_err(): tutils.raises(script.ScriptException, scr.unload) +@tutils.skip_appveyor def test_concurrent(): s = flow.State() fm = flow.FlowMaster(None, s) @@ -77,7 +78,7 @@ def test_concurrent(): # Two instantiations assert m.call_count == 0 # No calls yet. - assert (time.time() - t_start) < 0.5 + assert (time.time() - t_start) < 0.1 def test_concurrent2(): |