From: Zack Cerza <zack@redhat.com>
Date: Tue, 16 Aug 2016 23:04:38 +0000 (-0600)
Subject: Remove redundant timeout assignment
X-Git-Tag: 1.1.0~548^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f1d7d7e953cb352c8dd922634fa86d74b0cf345;p=teuthology.git

Remove redundant timeout assignment

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

diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py
index 4950d40a9..85e905546 100644
--- a/teuthology/orchestra/console.py
+++ b/teuthology/orchestra/console.py
@@ -54,8 +54,6 @@ class PhysicalConsole():
     def _exit_session(self, child, timeout=None):
         child.send('~.')
         t = timeout or self.timeout
-        if not t:
-            t = self.timeout
         r = child.expect(
             ['terminated ipmitool', pexpect.TIMEOUT, pexpect.EOF], timeout=t)
         if r != 0: