Reverting core/ and drivers/ directories before change 15514
This reverts commit 23fb21617769f4320de93b5b1805c6ec3ca9b809.
Change-Id: I0c116f8d7195c75c7ef17f296843924d3e2a0961
diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index 90b7e3e..086ae0a 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
Created on 24-Oct-2012
-Copyright 2012 Open Networking Foundation ( ONF )
+Copyright 2012 Open Networking Foundation (ONF)
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -34,10 +34,10 @@
def __init__( self ):
super( CLI, self ).__init__()
- def checkPrompt( self ):
+ def checkPrompt(self):
for key in self.options:
- if key == "prompt" and self.options[ 'prompt' ] is not None:
- self.prompt = self.options[ 'prompt' ]
+ if key == "prompt" and self.options['prompt'] is not None:
+ self.prompt = self.options['prompt']
break
def connect( self, **connectargs ):
@@ -100,7 +100,7 @@
else:
main.log.info( "Server asked for password, but none was "
"given in the .topo file. Trying "
- "no password." )
+ "no password.")
self.pwd = ""
self.handle.sendline( self.pwd )
j = self.handle.expect( [
@@ -181,8 +181,8 @@
if index == 0:
self.LASTRSP = self.LASTRSP + \
self.handle.before + self.handle.after
- main.log.info( "Executed :" + str( cmd ) +
- " \t\t Expected Prompt '" + str( expectPrompt ) +
+ main.log.info( "Executed :" + str(cmd ) +
+ " \t\t Expected Prompt '" + str( expectPrompt) +
"' Found" )
elif index == 1:
self.LASTRSP = self.LASTRSP + self.handle.before
@@ -397,7 +397,7 @@
else:
main.log.info( "Server asked for password, but none was "
"given in the .topo file. Trying "
- "no password." )
+ "no password.")
pwd = ""
handle.sendline( pwd )
j = handle.expect( [ self.prompt,