Author: laukpe
Date: Mon Sep 22 15:37:55 2008
New Revision: 803
Added:
trunk/proto/remote/TODO.txt (contents, props changed)
Modified:
trunk/proto/remote/python/robotremoteserver.py
trunk/proto/remote/ruby/robotremoteserver.rb
Log:
cleanup + todo list
Added: trunk/proto/remote/TODO.txt
==============================================================================
--- (empty file)
+++ trunk/proto/remote/TODO.txt Mon Sep 22 15:37:55 2008
@@ -0,0 +1,9 @@
+- exceptions testit
+- get args/docs -virheet
+- xmlrpc-virheet
+- stderr
+- big int & too big int
+- big float
+- big string
+- same testi kahdesti
+- ruby :label -testit
Modified: trunk/proto/remote/python/robotremoteserver.py
==============================================================================
--- trunk/proto/remote/python/robotremoteserver.py (original)
+++ trunk/proto/remote/python/robotremoteserver.py Mon Sep 22 15:37:55 2008
@@ -11,7 +11,8 @@
class RobotRemoteServer(SimpleXMLRPCServer):
def __init__(self, library, port=8270):
- SimpleXMLRPCServer.__init__(self, ('localhost', int(port)),
logRequests=False)
+ SimpleXMLRPCServer.__init__(self, ('localhost', int(port)),
+ logRequests=False)
self._library = library
self.register_function(self.get_keyword_names)
self.register_function(self.run_keyword)
@@ -66,8 +67,7 @@
# TODO: Not tested
def get_keyword_documentation(self, name):
- doc = inspect.getdoc(self._get_keyword(name))
- return doc or ''
+ return inspect.getdoc(self._get_keyword(name)) or ''
def _get_keyword(self, name):
if name == 'stop_remote_server':
@@ -98,4 +98,3 @@
sys.stdout.close()
sys.stdout = sys.__stdout__
return output
-
Modified: trunk/proto/remote/ruby/robotremoteserver.rb
==============================================================================
--- trunk/proto/remote/ruby/robotremoteserver.rb (original)
+++ trunk/proto/remote/ruby/robotremoteserver.rb Mon Sep 22 15:37:55 2008
@@ -22,7 +22,7 @@
def run_keyword(name, args)
intercept_stdout()
- result = {'status'=>'PASS', 'return'=>'', 'message'=>'', 'output'=>''}
+ result = {'status'=>'PASS', 'return'=>'', 'message'=>'', 'output'=>''}
begin
return_value = @library.send(name, *args)
result['return'] = handle_return_value(return_value)
@@ -61,15 +61,11 @@
if [String, Integer, Fixnum, Float, TrueClass,
FalseClass].include?(ret.class)
return ret
elsif ret.class == Array
- new_ret = []
- ret.each {|item|
- new_ret.push(handle_return_value(item))
- }
- return new_ret
+ return ret.collect { |item| handle_return_value(item) }
elsif ret.class == Hash
new_ret = {}
- ret.keys.each {|key|
- new_ret[key.to_s] = handle_return_value(ret[key])
+ ret.each_pair { |key,value|
+ new_ret[key.to_s] = handle_return_value(value)
}
return new_ret
else
