Merge "Doctor Iruya release notes"

[doctor.git] / doctor_tests / installer / base.py

diff --git a/doctor_tests/installer/base.py b/doctor_tests/installer/base.py
index df781ee..b227065 100644 (file)
--- a/doctor_tests/installer/base.py
+++ b/doctor_tests/installer/base.py
@@ -139,10 +139,10 @@ class BaseInstaller(object):
             ret, url = client.ssh(cmd)
             if ret:
                 raise Exception('Exec command to get transport from '
-                                'controller(%s) in Apex installer failed, '
+                                'controller(%s) failed, '
                                 'ret=%s, output=%s'
                                 % (self.controllers[0], ret, url))
-            else:
+            elif self.controllers[0] not in url:
                 # need to use ip instead of hostname
                 ret = (re.sub("@.*:", "@%s:" % self.controllers[0],
                        url[0].split("=", 1)[1]))
@@ -209,8 +209,13 @@ class BaseInstaller(object):
                 except:
                     client.scp(script_abs_path, script_name)
                 try:
-                    cmd = 'sudo %s %s' % (python, script_name)
+                    if ".py" in script_name:
+                        cmd = 'sudo %s %s' % (python, script_name)
+                    else:
+                        cmd = 'sudo chmod 700 %s;sudo ./%s' % (script_name,
+                                                               script_name)
                     ret, output = client.ssh(cmd)
+                    self.log.info('Command %s output %s' % (cmd, output))
                 except:
                     ret, output = client.ssh(cmd)