Revision: 7b3b2e5da41e
Author: Anssi Syrjäsalo <anssi.syrjas...@eficode.com>
Date: Tue Jun 18 07:13:27 2013
Log: Tests to not assume that home dirs are always under /home
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=7b3b2e5da41e
Modified:
/atest/connections_and_login.txt
/atest/get_file.txt
/atest/put_file.txt
/atest/resources/ssh_library_resources.txt
/atest/resources/user_information.py
=======================================
--- /atest/connections_and_login.txt Tue Jun 18 03:59:17 2013
+++ /atest/connections_and_login.txt Tue Jun 18 07:13:27 2013
@@ -23,7 +23,7 @@
${prev id} = Switch Connection second
Write pwd
${result} = Read Until Prompt
- Should Contain ${result} /home/test
+ Should Contain ${result} ${USER HOME}
Login Returns Banner Value
[Setup] Open Connection ${HOST}
=======================================
--- /atest/get_file.txt Mon Aug 27 05:07:10 2012
+++ /atest/get_file.txt Tue Jun 18 07:13:27 2013
@@ -12,28 +12,28 @@
*** Test Cases ***
Get File From Absolute Source
- Get File And Verify Listing /home/${USERNAME}/${TEST SCRIPT NAME}
${TMPDIR}${/} ${TEST SCRIPT NAME}
+ Get File And Verify Listing ${USER HOME}/${TEST SCRIPT NAME}
${TMPDIR}${/} ${TEST SCRIPT NAME}
Get File From Relative Source
Get File And Verify Listing ${TEST SCRIPT NAME} ${TMPDIR}${/}
${TEST SCRIPT NAME}
Get File With Different Name
- Get File And Verify Listing /home/${USERNAME}/${TEST SCRIPT NAME}
${TMPDIR}${/}foo.txt foo.txt
+ Get File And Verify Listing ${USER HOME}/${TEST SCRIPT NAME}
${TMPDIR}${/}foo.txt foo.txt
Get File With Pattern
- Get File And Verify Listing /home/${USERNAME}/* ${TMPDIR}${/}
${TEST SCRIPT NAME} ${INTERACTIVE TEST SCRIPT NAME} ${REPEAT TEST SCRIPT
NAME}
+ Get File And Verify Listing ${USER HOME}/* ${TMPDIR}${/} ${TEST
SCRIPT NAME} ${INTERACTIVE TEST SCRIPT NAME} ${REPEAT TEST SCRIPT NAME}
Getting Mulitple Source Files To Single File Fails
- Run Keyword And Expect Error Cannot copy multiple source files to one
destination file. SSHLibrary.Get File /home/${USERNAME}/*.sh
${TMPDIR}${/}foo
+ Run Keyword And Expect Error Cannot copy multiple source files to one
destination file. SSHLibrary.Get File ${USER HOME}/*.sh ${TMPDIR}${/}foo
Get File To Curdir
- SSHLibrary.Get File /home/${USERNAME}/${TEST SCRIPT NAME} .
+ SSHLibrary.Get File ${USER HOME}/${TEST SCRIPT NAME} .
${listing} = List Files In Directory .
Should Contain ${listing} ${TEST SCRIPT NAME}
[Teardown] Remove File ${TEST SCRIPT NAME}
Get File When Destination Directory Does Not Exist
- SSHLibrary.Get File /home/${USERNAME}/${TEST SCRIPT NAME}
${TMPDIR}${/}missingdir${/}foo.txt
+ SSHLibrary.Get File ${USER HOME}/${TEST SCRIPT NAME}
${TMPDIR}${/}missingdir${/}foo.txt
${listing} = List Files In Directory ${TMPDIR}${/}missingdir
Should Contain ${listing} foo.txt
=======================================
--- /atest/put_file.txt Thu Aug 30 00:50:42 2012
+++ /atest/put_file.txt Tue Jun 18 07:13:27 2013
@@ -11,7 +11,7 @@
*** Test Cases ***
Put File With Absolute Destination
- Put Files And Verify ${TEST FILE} /home/${USERNAME}/ ${TEST FILE
NAME}
+ Put Files And Verify ${TEST FILE} ${USER HOME}/ ${TEST FILE NAME}
[Teardown] Execute Command rm -f ${TEST FILE NAME}
Put File With Relative Destination
@@ -23,17 +23,17 @@
[Teardown] Execute Command rm -f ${TEST FILE NAME}
Put File With Different Name
- Put Files And Verify ${TEST FILE}
/home/${USERNAME}/another_name.txt another_name.txt
+ Put Files And Verify ${TEST FILE} ${USER HOME}/another_name.txt
another_name.txt
[Teardown] Execute Command rm -f another_name.txt
Put File With Newlines
- Put Files And Verify ${FILE WITH NEWLINES} /home/${USERNAME}/
${FILE WITH NEWLINES NAME}
+ Put Files And Verify ${FILE WITH NEWLINES} ${USER HOME}/ ${FILE
WITH NEWLINES NAME}
[Teardown] Execute Command rm -f ${FILE WITH NEWLINES NAME}
Put File And Specify Remote Newlines
[Setup] Create Directory ${TMPDIR}
- Put File And Specify Newlines ${FILE WITH NEWLINES}
/home/${USERNAME}/ CRLF ${FILE WITH NEWLINES NAME}
- SSHLibrary.Get File /home/${USERNAME}/${FILE WITH NEWLINES NAME}
${TMPDIR}${/}
+ Put File And Specify Newlines ${FILE WITH NEWLINES} ${USER HOME}/
CRLF ${FILE WITH NEWLINES NAME}
+ SSHLibrary.Get File ${USER HOME}/${FILE WITH NEWLINES NAME}
${TMPDIR}${/}
${content}= OS.Get Binary File ${TMPDIR}${/}${FILE WITH NEWLINES
NAME}
${expected}= OS.Get File ${FILE WITH NEWLINES}
${expected}= Replace String ${expected} \n \r\n
@@ -41,14 +41,14 @@
[Teardown] Execute Command rm -f ${FILE WITH NEWLINES NAME}
Put File With Pattern
- Put Files And Verify ${TEST FILE PATTERN} /home/${USERNAME}/ ${TEST
FILE NAME} ${TEST FILE 2 NAME}
+ Put Files And Verify ${TEST FILE PATTERN} ${USER HOME}/ ${TEST FILE
NAME} ${TEST FILE 2 NAME}
[Teardown] Execute Command rm -f ${TEST FILE NAME} ${TEST FILE 2
NAME}
Putting Multiple Source Files To Single File Fails
- Run Keyword And Expect Error ValueError: It is not possible to copy
multiple source files to one destination file. Put File ${TEST FILE
PATTERN} /home/${USERNAME}/invalid.txt
+ Run Keyword And Expect Error ValueError: It is not possible to copy
multiple source files to one destination file. Put File ${TEST FILE
PATTERN} ${USER HOME}/invalid.txt
Put File To Absolute Destination With Missing Subdirectories
- Put File ${TEST FILE} /home/${USERNAME}/robotdir/
+ Put File ${TEST FILE} ${USER HOME}/robotdir/
Verify Remote Files Exist robotdir ${TEST FILE NAME}
[Teardown] Execute Command rm -rf robotdir
@@ -58,7 +58,7 @@
[Teardown] Execute Command rm -rf robotdir
Put File With Pattern Matching Directory
- Put Files And Verify ${SCRIPTS}test_fi* /home/${USERNAME}/ ${TEST
FILE NAME} ${TEST FILE 2 NAME}
+ Put Files And Verify ${SCRIPTS}test_fi* ${USER HOME}/ ${TEST FILE
NAME} ${TEST FILE 2 NAME}
[Teardown] Execute Command rm -f ${TEST FILE NAME} ${TEST FILE 2
NAME}
Put File Should Fail When There Are No Source Files
@@ -67,7 +67,7 @@
Put File with special characters in filename
[Documentation]
http://code.google.com/p/robotframework-sshlibrary/issues/detail?id=55
Enable SSH Logging ${TEMPDIR}${/}ssh_log.txt
- Put File ${SPECIAL CHARS FILE} /home/${USERNAME}/robotdir/
+ Put File ${SPECIAL CHARS FILE} ${USER HOME}/robotdir/
Verify Remote Files Exist robotdir foo%2Fbar.txt
[Teardown] Execute Command rm -rf robotdir
=======================================
--- /atest/resources/ssh_library_resources.txt Thu Aug 30 00:50:42 2012
+++ /atest/resources/ssh_library_resources.txt Tue Jun 18 07:13:27 2013
@@ -24,10 +24,10 @@
*** Keywords ***
Login And Move Test Files
Login As Valid User
- Put File ${TEST SCRIPT} /home/${USERNAME}/${TEST SCRIPT NAME}
- Put File ${INTERACTIVE TEST SCRIPT} /home/${USERNAME}/${INTERACTIVE
TEST SCRIPT NAME}
- Put File ${REPEAT TEST SCRIPT} /home/${USERNAME}/${REPEAT TEST
SCRIPT NAME}
- Put File ${FILE WITH NEWLINES} /home/${USERNAME}/
+ Put File ${TEST SCRIPT} ${USER HOME}/${TEST SCRIPT NAME}
+ Put File ${INTERACTIVE TEST SCRIPT} ${USER HOME}/${INTERACTIVE TEST
SCRIPT NAME}
+ Put File ${REPEAT TEST SCRIPT} ${USER HOME}/${REPEAT TEST SCRIPT
NAME}
+ Put File ${FILE WITH NEWLINES} ${USER HOME}/
Remove Test Files And Close Connections
Execute Command rm -f ${INTERACTIVE TEST SCRIPT NAME} ${TEST SCRIPT
NAME} ${REPEAT TEST SCRIPT NAME} ${COUNTER NAME} ${FILE WITH NEWLINES NAME}
@@ -39,4 +39,3 @@
Open Connection To Test Host
Open Connection ${HOST}
-
=======================================
--- /atest/resources/user_information.py Sun Nov 7 23:26:48 2010
+++ /atest/resources/user_information.py Tue Jun 18 07:13:27 2013
@@ -2,3 +2,6 @@
USERNAME = "test"
PASSWORD = "test"
PROMPT = "$"
+
+from os import environ
+USERHOME = environ['HOME'].replace(environ['USER'], USERNAME)
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
