Revision: bc9d14d0d74a
Author: Anssi Syrjäsalo <[email protected]>
Date: Mon Jul 29 08:40:05 2013
Log: Local tmpdir is created under Operating System's TEMPDIR
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=bc9d14d0d74a
Modified:
/atest/get_dir.txt
/atest/get_file.txt
/atest/put_file.txt
/atest/resources/ssh_library_resources.txt
=======================================
--- /atest/get_dir.txt Mon Jul 29 07:54:04 2013
+++ /atest/get_dir.txt Mon Jul 29 08:40:05 2013
@@ -8,16 +8,16 @@
*** Test Cases ***
Get Dir Using Absolute Source
- Get Dir And Verify Content ${USER HOME}/test_root robot-tmpdir
- [Teardown] Remove Directory robot-tmpdir True
+ Get Dir And Verify Content ${USER HOME}/test_root ${LOCAL TMPDIR}
+ [Teardown] Remove Directory ${LOCAL TMPDIR} True
Get Dir Using Relative Source
- Get Dir And Verify Content test_root robot-tmpdir
- [Teardown] Remove Directory robot-tmpdir True
+ Get Dir And Verify Content test_root ${LOCAL TMPDIR}
+ [Teardown] Remove Directory ${LOCAL TMPDIR} True
Get Dir Using Different Name
- Get Dir And Verify Content ${USER HOME}/test_root robot-tmpdir/foo
- [Teardown] Remove Directory robot-tmpdir True
+ Get Dir And Verify Content ${USER HOME}/test_root ${LOCAL
TMPDIR}${/}foo
+ [Teardown] Remove Directory ${LOCAL TMPDIR} True
*** Keywords ***
Get Dir And Verify Content
=======================================
--- /atest/get_file.txt Mon Jul 29 07:54:04 2013
+++ /atest/get_file.txt Mon Jul 29 08:40:05 2013
@@ -2,29 +2,25 @@
Force Tags pybot jybot
Suite Setup Login and Move Test Files
Suite Teardown Remove Test Files and Close Connections
-Test Teardown Remove Directory ${TMPDIR} yes
+Test Teardown Remove Directory ${LOCAL TMPDIR} yes
Resource resources/ssh_library_resources.txt
Library OperatingSystem
-*** Variables ***
-${TMPDIR} robot-tmpdir
-${TMPDIR2} robot-tmpdir2
-
*** Test Cases ***
Get File From Absolute Source
- Get File And Verify Listing ${USER HOME}/${TEST SCRIPT NAME}
${TMPDIR}${/} ${TEST SCRIPT NAME}
+ Get File And Verify Listing ${USER HOME}/${TEST SCRIPT NAME} ${LOCAL
TMPDIR}${/} ${TEST SCRIPT NAME}
Get File From Relative Source
- Get File And Verify Listing ${TEST SCRIPT NAME} ${TMPDIR}${/}
${TEST SCRIPT NAME}
+ Get File And Verify Listing ${TEST SCRIPT NAME} ${LOCAL TMPDIR}${/}
${TEST SCRIPT NAME}
Get File With Different Name
- Get File And Verify Listing ${USER HOME}/${FILE WITH NON-ASCII NAME}
${TMPDIR}${/}foo.txt foo.txt
+ Get File And Verify Listing ${USER HOME}/${FILE WITH NON-ASCII NAME}
${LOCAL TMPDIR}${/}foo.txt foo.txt
Get File With Pattern
- Get File And Verify Listing ${USER HOME}/* ${TMPDIR}${/} ${TEST
SCRIPT NAME} ${INTERACTIVE TEST SCRIPT NAME} ${REPEAT TEST SCRIPT NAME}
+ Get File And Verify Listing ${USER HOME}/* ${LOCAL TMPDIR}${/}
${TEST SCRIPT NAME} ${INTERACTIVE TEST SCRIPT NAME} ${REPEAT TEST SCRIPT
NAME}
Getting Multiple Source Files To Single File Fails
- Run Keyword And Expect Error Cannot copy multiple source files to one
destination file. SSHLibrary.Get File ${USER HOME}/*.sh ${TMPDIR}${/}foo
+ Run Keyword And Expect Error Cannot copy multiple source files to one
destination file. SSHLibrary.Get File ${USER HOME}/*.sh ${LOCAL
TMPDIR}${/}foo
Get File To Curdir
SSHLibrary.Get File ${USER HOME}/${TEST SCRIPT NAME} .
@@ -33,20 +29,20 @@
[Teardown] Remove File ${TEST SCRIPT NAME}
Get File When Destination Directory Does Not Exist
- SSHLibrary.Get File ${USER HOME}/${TEST SCRIPT NAME}
${TMPDIR}${/}missingdir${/}foo.txt
- ${listing} = List Files In Directory ${TMPDIR}${/}missingdir
+ SSHLibrary.Get File ${USER HOME}/${TEST SCRIPT NAME} ${LOCAL
TMPDIR}${/}missingdir${/}foo.txt
+ ${listing} = List Files In Directory ${LOCAL TMPDIR}${/}missingdir
Should Contain ${listing} foo.txt
Get File From A Path Not Under Home Directory
[Setup] Create Tmp Dir And Move File
- Get File And Verify Listing /tmp/test_file.txt ${TMPDIR}${/}
test_file.txt
+ Get File And Verify Listing /tmp/test_file.txt ${LOCAL TMPDIR}${/}
test_file.txt
[Teardown] Remove Tmp Dir And Remote File
Get File To Absolute Destination
- SSHLibrary.Get File ${TEST SCRIPT NAME} ${CURDIR}${/}${TMPDIR2}${/}
- ${contents} = List Directory ${CURDIR}${/}${TMPDIR2}${/}
+ SSHLibrary.Get File ${TEST SCRIPT NAME} ${CURDIR}${/}${LOCAL
TMPDIR}${/}
+ ${contents} = List Directory ${CURDIR}${/}${LOCAL TMPDIR}${/}
Should Contain ${contents} ${TEST SCRIPT NAME}
- [Teardown] Remove Directory ${CURDIR}${/}${TMPDIR2} yes
+ [Teardown] Remove Directory ${CURDIR}${/}${LOCAL TMPDIR} yes
Get File Should Fail When There Are No Source Files
Run Keyword And Expect Error There were no source files
matching 'non-existing' SSHLibrary.Get File non-existing
@@ -55,15 +51,15 @@
Get File And Verify Listing
[Arguments] ${source} ${destination} @{expected}
SSHLibrary.Get File ${source} ${destination}
- ${listing} = List Files In Directory ${TMPDIR}
+ ${listing} = List Files In Directory ${LOCAL TMPDIR}
: FOR ${filename} IN @{expected}
\ Should Contain ${listing} ${filename}
Create Tmp Dir And Move File
Put File ${TEST FILE} /tmp/
- Create Directory ${TMPDIR}
+ Create Directory ${LOCAL TMPDIR}
Remove Tmp Dir And Remote File
Execute Command rm -f /tmp/test_file.txt
- Remove Directory ${TMPDIR} yes
+ Remove Directory ${LOCAL TMPDIR} yes
=======================================
--- /atest/put_file.txt Mon Jul 29 08:06:46 2013
+++ /atest/put_file.txt Mon Jul 29 08:40:05 2013
@@ -8,7 +8,6 @@
Library String
*** Variables ***
-${TMPDIR} robot-tmpdir
${TEST FILE PATTERN} ${TEXTFILES}${/}test*.txt
*** Test Cases ***
@@ -37,10 +36,10 @@
[Teardown] Execute Command rm -f ${FILE WITH NON-ASCII NAME}
Put File And Specify Remote Newlines
- [Setup] Create Directory ${TMPDIR}
+ [Setup] Create Directory ${LOCAL 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}
+ SSHLibrary.Get File ${USER HOME}/${FILE WITH NEWLINES NAME} ${LOCAL
TMPDIR}${/}
+ ${content}= OS.Get Binary File ${LOCAL TMPDIR}${/}${FILE WITH
NEWLINES NAME}
${expected}= OS.Get File ${FILE WITH NEWLINES}
${expected}= Replace String ${expected} \n \r\n
Should Be Equal ${content} ${expected}
@@ -72,7 +71,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
+ Enable SSH Logging ${LOCAL TMPDIR}${/}ssh_log.txt
Put File ${FILE WITH SPECIAL CHARS} ${USER HOME}/robotdir/
Verify Remote Files Exist robotdir foo%2Fbar.txt
[Teardown] Execute Command rm -rf robotdir
@@ -103,5 +102,5 @@
\ Should Contain ${listing} ${filename}
Remove Local Temp Dir And Remote File
- Remove Directory ${TMPDIR} yes
+ Remove Directory ${LOCAL TMPDIR} yes
Execute Command rm -f ${FILE WITH NEWLINES NAME}
=======================================
--- /atest/resources/ssh_library_resources.txt Mon Jul 29 08:17:02 2013
+++ /atest/resources/ssh_library_resources.txt Mon Jul 29 08:40:05 2013
@@ -23,6 +23,7 @@
${FILE WITH NON-ASCII} ${SPECIAL TEXTFILES}${/}${FILE WITH NON-ASCII NAME}
${FILE WITH SPECIAL CHARS NAME} foo%2Fbar.txt
${FILE WITH SPECIAL CHARS} ${SPECIAL TEXTFILES}${/}${FILE WITH SPECIAL
CHARS NAME}
+${LOCAL TMPDIR} ${TEMPDIR}${/}robot-tmpdir
*** Keywords ***
Login And Move Test Files
--
---
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 [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
