aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-19 22:52:19 +0100
committerGitHub <noreply@github.com>2018-02-19 22:52:19 +0100
commitda4c1ee625a3451b58c69454ecd5f4faf3cb67d4 (patch)
tree60837eeba185531a994af809ea911c493812e431 /test
parenta9402975dc81d77ffe1c85911b27c7e9a26e8f4a (diff)
parente9bdada1f59a28e3cb956b25f2445e6c1dc5d939 (diff)
downloadmitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.tar.gz
mitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.tar.bz2
mitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.zip
Merge pull request #2881 from cortesi/refreshopt
option refresh_server_playback -> server_replay_refresh
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_serverplayback.py6
-rw-r--r--test/mitmproxy/tools/console/test_master.py2
-rw-r--r--test/mitmproxy/tools/console/test_statusbar.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/addons/test_serverplayback.py b/test/mitmproxy/addons/test_serverplayback.py
index 7605a5d9..32249a88 100644
--- a/test/mitmproxy/addons/test_serverplayback.py
+++ b/test/mitmproxy/addons/test_serverplayback.py
@@ -331,7 +331,7 @@ def test_server_playback_full():
with taddons.context() as tctx:
tctx.configure(
s,
- refresh_server_playback = True,
+ server_replay_refresh = True,
)
f = tflow.tflow()
@@ -363,8 +363,8 @@ def test_server_playback_kill():
with taddons.context() as tctx:
tctx.configure(
s,
- refresh_server_playback = True,
- replay_kill_extra=True
+ server_replay_refresh = True,
+ server_replay_kill_extra=True
)
f = tflow.tflow()
diff --git a/test/mitmproxy/tools/console/test_master.py b/test/mitmproxy/tools/console/test_master.py
index 9779a482..6f46ce9e 100644
--- a/test/mitmproxy/tools/console/test_master.py
+++ b/test/mitmproxy/tools/console/test_master.py
@@ -8,7 +8,7 @@ from ... import tservers
def test_options():
- assert options.Options(replay_kill_extra=True)
+ assert options.Options(server_replay_kill_extra=True)
class TestMaster(tservers.MasterTest):
diff --git a/test/mitmproxy/tools/console/test_statusbar.py b/test/mitmproxy/tools/console/test_statusbar.py
index b131a5d3..8522eb96 100644
--- a/test/mitmproxy/tools/console/test_statusbar.py
+++ b/test/mitmproxy/tools/console/test_statusbar.py
@@ -16,8 +16,8 @@ def test_statusbar(monkeypatch):
anticache=True,
anticomp=True,
showhost=True,
- refresh_server_playback=False,
- replay_kill_extra=True,
+ server_replay_refresh=False,
+ server_replay_kill_extra=True,
upstream_cert=False,
stream_large_bodies="3m",
mode="transparent",