Merge pull request #451 from mattbennett/fix-banner-nameko-on-shell

Fix banner nameko on shell

nameko/cli/shell.py

@@ -70,17 +70,21 @@ def make_nameko_helper(config):
 
 
 def main(args):
-    banner = 'Nameko Python %s shell on %s\nBroker: %s' % (
-        sys.version,
-        sys.platform,
-        args.broker.encode('utf-8'),
-    )
 
     if args.config:
         with open(args.config) as fle:
             config = yaml.load(fle)
+        broker_from = " (from --config)"
     else:
         config = {AMQP_URI_CONFIG_KEY: args.broker}
+        broker_from = ""
+
+    banner = 'Nameko Python %s shell on %s\nBroker: %s%s' % (
+        sys.version,
+        sys.platform,
+        config[AMQP_URI_CONFIG_KEY],
+        broker_from
+    )
 
     ctx = {}
     ctx['n'] = make_nameko_helper(config)

test/cli/test_shell.py

@@ -150,3 +150,50 @@ def test_config(pystartup, rabbit_config, tmpdir):
         SERIALIZER_CONFIG_KEY: 'json'
     }
     local['n'].disconnect()
+
+
+class TestBanner(object):
+
+    @pytest.yield_fixture(autouse=True)
+    def patch_nameko_helper(self):
+        with patch('nameko.cli.shell.make_nameko_helper'):
+            yield
+
+    def test_broker_as_param(self):
+
+        amqp_uri = "amqp://broker/param"
+
+        parser = setup_parser()
+        args = parser.parse_args(['shell', '--broker', amqp_uri])
+
+        with patch('nameko.cli.shell.ShellRunner') as shell_runner:
+            Shell.main(args)
+
+        expected_message = (
+            "Broker: {}".format(amqp_uri)
+        )
+        (banner, _), _ = shell_runner.call_args
+        assert expected_message in banner
+
+    def test_broker_from_config(self, tmpdir):
+
+        amqp_uri = "amqp://broker/config"
+
+        config = tmpdir.join('config.yaml')
+        config.write("""
+            WEB_SERVER_ADDRESS: '0.0.0.0:8001'
+            AMQP_URI: '{}'
+            serializer: 'json'
+        """.format(amqp_uri))
+
+        parser = setup_parser()
+        args = parser.parse_args(['shell', '--config', config.strpath])
+
+        with patch('nameko.cli.shell.ShellRunner') as shell_runner:
+            Shell.main(args)
+
+        expected_message = (
+            "Broker: {} (from --config)".format(amqp_uri)
+        )
+        (banner, _), _ = shell_runner.call_args
+        assert expected_message in banner