Skip to content

Commit 35297d1

Browse files
committed
try to get tests working on any host
1 parent e7ccd9b commit 35297d1

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

gabbi/tests/external_server.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
from gabbi.tests import simple_wsgi
1818

1919

20-
def run(port):
20+
def run(host, port):
2121
server = simple_server.make_server(
22-
"127.0.0.1",
22+
host,
2323
int(port),
2424
simple_wsgi.SimpleWsgi(),
2525
)
2626
server.serve_forever()
2727

2828

2929
if __name__ == "__main__":
30-
port = sys.argv[1]
31-
run(port)
30+
host = sys.argv[1]
31+
port = sys.argv[2]
32+
run(host, port)

gabbi/tests/test_runner.py

+14-7
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,21 @@ def get_free_port():
3535

3636
class ForkedWSGIServer:
3737

38-
def __init__(self, port):
38+
def __init__(self, host, port):
39+
self.host = host
3940
self.port = port
4041

4142
def start(self):
42-
self.process = subprocess.Popen([
43-
"python", "gabbi/tests/external_server.py", str(self.port)],
43+
self.process = subprocess.Popen(
44+
[
45+
"python",
46+
"gabbi/tests/external_server.py",
47+
self.host,
48+
str(self.port)
49+
],
4450
env=os.environ.update({"PYTHONPATH": "."}),
45-
close_fds=True)
51+
close_fds=True,
52+
)
4653
# We need to sleep a bit to let the wsgi server start.
4754
# TODO(cdent): This is regrettable.
4855
time.sleep(.4)
@@ -58,9 +65,9 @@ class RunnerTest(unittest.TestCase):
5865
def setUp(self):
5966
super(RunnerTest, self).setUp()
6067

61-
self.host = "localhost"
62-
self.resolved_host = "1.0.0.127.in-addr.arpa"
63-
self.server = ForkedWSGIServer(self.port)
68+
self.host = "0.0.0.0"
69+
self.resolved_host = socket.gethostname()
70+
self.server = ForkedWSGIServer(self.host, self.port)
6471
self.server.start()
6572

6673
self._stdin = sys.stdin

0 commit comments

Comments
 (0)