Revision: 60d56a9e80c5
Branch: default
Author: jussi.ao.malinen
Date: Fri Nov 16 07:23:25 2012
Log: make screenshot tests non critical and fail automatoically if
dependencies are missing
http://code.google.com/p/robotframework/source/detail?r=60d56a9e80c5
Added:
/atest/robot/standard_libraries/screenshot/screenshot_dependency_check.py
/atest/robot/standard_libraries/screenshot/screenshot_resource.txt
Modified:
/atest/robot/standard_libraries/screenshot/screenshot.txt
/atest/robot/standard_libraries/screenshot/set_screenshot_directory.txt
/atest/robot/standard_libraries/screenshot/take_screenshot.txt
=======================================
--- /dev/null
+++
/atest/robot/standard_libraries/screenshot/screenshot_dependency_check.py
Fri Nov 16 07:23:25 2012
@@ -0,0 +1,2 @@
+def interpreter_is_jython_or_ipy(interpreter):
+ return 'jython' in interpreter or 'ipy' in interpreter
=======================================
--- /dev/null
+++ /atest/robot/standard_libraries/screenshot/screenshot_resource.txt Fri
Nov 16 07:23:25 2012
@@ -0,0 +1,24 @@
+*** Settings ***
+Library OperatingSystem
+Library screenshot_dependency_check.py
+Resource atest_resource.txt
+
+*** Keywords ***
+Make Test Non-critical And Fail It If Screenshot dependencies are not
installed
+ ${SCREENSHOT_DEPENDENCIES} = Are Screenshot dependencies available
+ Run Keyword if "${SCREENSHOT_DEPENDENCIES}"=="NO" Remove Tags
regression
+ Run Keyword if "${SCREENSHOT_DEPENDENCIES}"=="NO" Fail This test is
made non-critical and not executed because Screenshot library's
dependencies are not installed.
+
+Are Screenshot dependencies available
+ ${IS IPY OR JYTHON} = Interpreter is jython or ipy ${INTERPRETER}
+ ${SCREENSHOT DEPENDENCIES INSTALLED} = Run keyword if ${IS IPY OR
JYTHON} Ipy and jython have dependencies
+ ... ELSE Interpreter has screenshot dependencies
+ [return] ${SCREENSHOT DEPENDENCIES INSTALLED}
+
+Ipy and jython have dependencies
+ [return] YES
+
+Interpreter has screenshot dependencies
+ ${output} = Run ${INTERPRETER} -c "import
robot.libraries.Screenshot as Screenshot; print Screenshot.wx or
Screenshot.gdk or Screenshot.ImageGrab"
+ ${SCREENSHOT DEPENDENCIES INSTALLED} = Set Variable
If """${output}""" == "None" NO YES
+ [return] ${SCREENSHOT DEPENDENCIES INSTALLED}
=======================================
--- /atest/robot/standard_libraries/screenshot/screenshot.txt Thu Sep 13
04:39:22 2012
+++ /atest/robot/standard_libraries/screenshot/screenshot.txt Fri Nov 16
07:23:25 2012
@@ -1,7 +1,8 @@
*** Settings ***
Suite Setup Run Tests -l log.html -L debug
standard_libraries/screenshot/screenshot.txt
+Test setup Make Test Non-critical And Fail It If Screenshot
dependencies are not installed
Force Tags pybot jybot regression
-Resource atest_resource.txt
+Resource screenshot_resource.txt
*** Test Cases ***
Save Screenshot is Deprecated
=======================================
--- /atest/robot/standard_libraries/screenshot/set_screenshot_directory.txt
Thu Jul 7 05:11:04 2011
+++ /atest/robot/standard_libraries/screenshot/set_screenshot_directory.txt
Fri Nov 16 07:23:25 2012
@@ -1,7 +1,8 @@
*** Settings ***
Suite Setup Run Tests ${EMPTY}
standard_libraries/screenshot/set_screenshot_directory.txt
+Test setup Make Test Non-critical And Fail It If Screenshot
dependencies are not installed
Force Tags regression pybot jybot
-Resource atest_resource.txt
+Resource screenshot_resource.txt
*** Test Cases ***
Set Screenshot Directory
=======================================
--- /atest/robot/standard_libraries/screenshot/take_screenshot.txt Thu Sep
13 04:39:22 2012
+++ /atest/robot/standard_libraries/screenshot/take_screenshot.txt Fri Nov
16 07:23:25 2012
@@ -1,7 +1,8 @@
*** Settings ***
Suite Setup Run Tests -l log.html -L debug
standard_libraries/screenshot/take_screenshot.txt
+Test setup Make Test Non-critical And Fail It If Screenshot
dependencies are not installed
Force Tags regression pybot jybot
-Resource atest_resource.txt
+Resource screenshot_resource.txt
*** Test Cases ***
