Revision: 3321
Author: pekka.klarck
Date: Wed May 19 01:02:43 2010
Log: handle dir suites source correctly + todo
http://code.google.com/p/robotframework/source/detail?r=3321
Modified:
/trunk/src/robot/parsing/datareader.py
/trunk/src/robot/parsing/populator.py
=======================================
--- /trunk/src/robot/parsing/datareader.py Tue May 18 07:14:11 2010
+++ /trunk/src/robot/parsing/datareader.py Wed May 19 01:02:43 2010
@@ -72,6 +72,7 @@
try:
FileReader().read(init, datadir)
except DataError, err:
+ # TODO: Reverse control?
LOGGER.error(unicode(err))
for child in children:
try:
=======================================
--- /trunk/src/robot/parsing/populator.py Wed May 19 00:55:08 2010
+++ /trunk/src/robot/parsing/populator.py Wed May 19 01:02:43 2010
@@ -321,6 +321,8 @@
def _determine_curdir(self, datafile):
if datafile.source:
+ if os.path.isdir(datafile.source):
+ return datafile.source
return os.path.dirname(datafile.source)
return None
