Fixed minor error in teston.py and some conflict issues with master
diff --git a/TestON/core/Thread.py b/TestON/core/Thread.py
index da30339..fcc06b5 100644
--- a/TestON/core/Thread.py
+++ b/TestON/core/Thread.py
@@ -18,6 +18,8 @@
if self.target is not None:
self.result = self.target( *self.args, **self.kwargs )
except Exception as e:
- print "Thread-" + str( self.threadID ) + " '" + self.name + "'"\
- ":something went wrong with " + self.target + " method"
+ print "ThreadID:" + str( self.threadID ) + ", Name:" +\
+ self.name + "- something went wrong with " +\
+ str( self.target.im_class ) + "." +\
+ str( self.target.im_func ) + " method: "
print e
diff --git a/TestON/core/teston.py b/TestON/core/teston.py
index b8025c3..1d41acf 100644
--- a/TestON/core/teston.py
+++ b/TestON/core/teston.py
@@ -165,13 +165,12 @@
driverClass = getattr(driverModule, driverName)
driverObject = driverClass()
- if "OC" in self.componentDictionary[component]['host']:
- try:
- self.componentDictionary[component]['host'] = os.environ[str( self.componentDictionary[component]['host'])]
- except KeyError:
- self.log.error("Missing OC environment variable! Check your environment setup and retry")
- except Exception as inst:
- self.log.error("Uncaught exception: " + str(inst))
+ try:
+ self.componentDictionary[component]['host'] = os.environ[str( self.componentDictionary[component]['host'])]
+ except KeyError:
+ self.log.info("Missing OC environment variable! Using stored IPs")
+ except Exception as inst:
+ self.log.error("Uncaught exception: " + str(inst))
connect_result = driverObject.connect(user_name = self.componentDictionary[component]['user'] if ('user' in self.componentDictionary[component].keys()) else getpass.getuser(),
ip_address= self.componentDictionary[component]['host'] if ('host' in self.componentDictionary[component].keys()) else 'localhost',