diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /test/test_examples.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'test/test_examples.py')
| -rw-r--r-- | test/test_examples.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test_examples.py b/test/test_examples.py index e63f1c7a..e9bccd2e 100644 --- a/test/test_examples.py +++ b/test/test_examples.py @@ -11,15 +11,17 @@ def test_load_scripts(): tmaster = tservers.TestMaster(config.ProxyConfig()) for f in scripts: - if "har_extractor" in f: + if "har_extractor" in f or "flowwriter" in f: f += " -" if "iframe_injector" in f: f += " foo" # one argument required + if "filt" in f: + f += " ~a" if "modify_response_body" in f: f += " foo bar" # two arguments required try: s = script.Script(f, tmaster) # Loads the script file. - except Exception, v: + except Exception as v: if not "ImportError" in str(v): raise else: |