@@ -86,6 +86,14 @@ def __repr__(self):
86
86
return '<LiveServer listening at %s>' % self .url ()
87
87
88
88
89
+ def _rewrite_server_name (server_name , new_port ):
90
+ """Rewrite server port in ``server_name`` with ``new_port`` value."""
91
+ sep = ':'
92
+ if sep in server_name :
93
+ server_name , port = server_name .split (sep , 1 )
94
+ return sep .join ((server_name , new_port ))
95
+
96
+
89
97
@pytest .fixture (scope = 'function' )
90
98
def live_server (request , app , monkeypatch ):
91
99
"""Run application in a separate process.
@@ -107,18 +115,11 @@ def test_server_is_up_and_running(live_server):
107
115
port = s .getsockname ()[1 ]
108
116
s .close ()
109
117
110
- def rewrite_server_name (server_name , new_port ):
111
- """Rewrite server port in ``server_name`` with ``new_port`` value."""
112
- sep = ':'
113
- if sep in server_name :
114
- server_name , port = server_name .split (sep , 1 )
115
- return sep .join ((server_name , new_port ))
116
-
117
118
# Explicitly set application ``SERVER_NAME`` for test suite
118
119
# and restore original value on test teardown.
119
120
server_name = app .config ['SERVER_NAME' ] or 'localhost'
120
121
monkeypatch .setitem (app .config , 'SERVER_NAME' ,
121
- rewrite_server_name (server_name , str (port )))
122
+ _rewrite_server_name (server_name , str (port )))
122
123
123
124
server = LiveServer (app , port )
124
125
request .addfinalizer (server .stop )
0 commit comments