Use Remote.shortname in logs

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index 63fce9ddca0a1d556ac9d4fc586f87be607c1e34..88a53f81f13f0bd6b93eb7098ae45642e8e651d2 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -104,7 +104,7 @@ class Remote(object):
 
         TODO refactor to move run.run here?
         """
-        r = self._runner(client=self.ssh, name=self.hostname, **kwargs)
+        r = self._runner(client=self.ssh, name=self.shortname, **kwargs)
         r.remote = self
         return r
 

diff --git a/teuthology/orchestra/test/test_remote.py b/teuthology/orchestra/test/test_remote.py
index 663009b2e4317fa5d7f0945886dec67c35dda92e..e52a2f7a2f3555ab2ac2da55b1d60bec573a037b 100644 (file)
--- a/teuthology/orchestra/test/test_remote.py
+++ b/teuthology/orchestra/test/test_remote.py
@@ -41,13 +41,13 @@ class TestRemote(object):
             exitstatus=None,
             exited=None,
             )
+        r = remote.Remote(name='jdoe@xyzzy.example.com', ssh=ssh)
         run.expects_call().with_args(
             client=fudge.inspector.arg.passes_test(lambda v: v is ssh),
             args=fudge.inspector.arg.passes_test(lambda v: v is args),
             foo=fudge.inspector.arg.passes_test(lambda v: v is foo),
-            name='xyzzy.example.com'
+            name=r.shortname,
             ).returns(ret)
-        r = remote.Remote(name='jdoe@xyzzy.example.com', ssh=ssh)
         # monkey patch ook ook
         r._runner = run
         got = r.run(