Permalink
Browse files

Merge PR256: accept $WORMHOLE_RELAY_URL and $WORMHOLE_TRANSIT_HELPER

  • Loading branch information...
warner committed Oct 5, 2017
2 parents 7ad0069 + b362adf commit 5feffe7fdbb27308151db255c431d8fed1fb3eb1
Showing with 53 additions and 0 deletions.
  1. +2 −0 src/wormhole/cli/cli.py
  2. +51 −0 src/wormhole/test/test_args.py
View
@@ -60,11 +60,13 @@ def get_command(self, ctx, cmd_name):
"--appid", default=None, metavar="APPID", help="appid to use")
@click.option(
"--relay-url", default=public_relay.RENDEZVOUS_RELAY,
envvar='WORMHOLE_RELAY_URL',
metavar="URL",
help="rendezvous relay to use",
)
@click.option(
"--transit-helper", default=public_relay.TRANSIT_RELAY,
envvar='WORMHOLE_TRANSIT_HELPER',
metavar="tcp:HOST:PORT",
help="transit relay to use",
)
@@ -1,4 +1,6 @@
import os
import sys
import mock
from twisted.trial import unittest
from ..cli.public_relay import RENDEZVOUS_RELAY, TRANSIT_RELAY
from .common import config
@@ -71,6 +73,31 @@ def test_zeromode(self):
cfg = config("send", "-0", "fn")
self.assertEqual(cfg.zeromode, True)
def test_relay_env_var(self):
relay_url = str(mock.sentinel.relay_url)
with mock.patch.dict(os.environ, WORMHOLE_RELAY_URL=relay_url):
cfg = config("send")
self.assertEqual(cfg.relay_url, relay_url)
# Make sure cmd line option overrides environment variable
relay_url_2 = str(mock.sentinel.relay_url_2)
with mock.patch.dict(os.environ, WORMHOLE_RELAY_URL=relay_url):
cfg = config("--relay-url", relay_url_2, "send")
self.assertEqual(cfg.relay_url, relay_url_2)
def test_transit_env_var(self):
transit_url = str(mock.sentinel.transit_url)
with mock.patch.dict(os.environ, WORMHOLE_TRANSIT_HELPER=transit_url):
cfg = config("send")
self.assertEqual(cfg.transit_helper, transit_url)
# Make sure cmd line option overrides environment variable
transit_url_2 = str(mock.sentinel.transit_url_2)
with mock.patch.dict(os.environ, WORMHOLE_TRANSIT_HELPER=transit_url):
cfg = config("--transit-helper", transit_url_2, "send")
self.assertEqual(cfg.transit_helper, transit_url_2)
class Receive(unittest.TestCase):
def test_baseline(self):
cfg = config("receive")
@@ -140,6 +167,30 @@ def test_output_file(self):
cfg = config("receive", "--output-file", "fn")
self.assertEqual(cfg.output_file, u"fn")
def test_relay_env_var(self):
relay_url = str(mock.sentinel.relay_url)
with mock.patch.dict(os.environ, WORMHOLE_RELAY_URL=relay_url):
cfg = config("receive")
self.assertEqual(cfg.relay_url, relay_url)
# Make sure cmd line option overrides environment variable
relay_url_2 = str(mock.sentinel.relay_url_2)
with mock.patch.dict(os.environ, WORMHOLE_RELAY_URL=relay_url):
cfg = config("--relay-url", relay_url_2, "receive")
self.assertEqual(cfg.relay_url, relay_url_2)
def test_transit_env_var(self):
transit_url = str(mock.sentinel.transit_url)
with mock.patch.dict(os.environ, WORMHOLE_TRANSIT_HELPER=transit_url):
cfg = config("receive")
self.assertEqual(cfg.transit_helper, transit_url)
# Make sure cmd line option overrides environment variable
transit_url_2 = str(mock.sentinel.transit_url_2)
with mock.patch.dict(os.environ, WORMHOLE_TRANSIT_HELPER=transit_url):
cfg = config("--transit-helper", transit_url_2, "receive")
self.assertEqual(cfg.transit_helper, transit_url_2)
class Config(unittest.TestCase):
def test_send(self):
cfg = config("send")

0 comments on commit 5feffe7

Please sign in to comment.