2 new revisions:

Revision: a227983752d2
Author:   Anssi Syrjäsalo <anssi.syrjas...@eficode.com>
Date:     Mon Jul 29 07:18:01 2013
Log:      Tests for Put Dir subdirectory content
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=a227983752d2

Revision: 663eefb1330b
Author:   Anssi Syrjäsalo <anssi.syrjas...@eficode.com>
Date:     Mon Jul 29 07:41:27 2013
Log:      Tidied up test and suite setups and teardowns
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=663eefb1330b

==============================================================================
Revision: a227983752d2
Author:   Anssi Syrjäsalo <anssi.syrjas...@eficode.com>
Date:     Mon Jul 29 07:18:01 2013
Log:      Tests for Put Dir subdirectory content

http://code.google.com/p/robotframework-sshlibrary/source/detail?r=a227983752d2

Modified:
 /atest/put_dir.txt

=======================================
--- /atest/put_dir.txt  Mon Jul 29 06:19:14 2013
+++ /atest/put_dir.txt  Mon Jul 29 07:18:01 2013
@@ -1,7 +1,7 @@
 *** Settings ***
 Force Tags      pybot   jybot
 Suite Setup     Login As Valid User
-Suite Teardown  Run Keywords  Remove Test Files and Close Connections
+Suite Teardown  Close All Connections
 Resource        resources/ssh_library_resources.txt

 *** Test Cases ***
@@ -30,12 +30,15 @@

 Verify Remote Dir Does Not Exist
     [Arguments]  ${expected}
- ${rc} = Execute Command test -d ${expected} return_stdout=${EMPTY} return_rc=true
-    Should Be Equal As Integers  ${rc}  1
+    ${stdout} =  Execute Command  ls ${expected}
+    Should Not Contain  ${stdout}  ${expected}

 Verify Remote Dir Structure Exists
     [Arguments]  ${expected}
- ${rc} = Execute Command test -d ${expected} return_stdout=${EMPTY} return_rc=true
-    Should Be Equal As Integers  ${rc}  0
- ${rc} = Execute Command test -d ${expected}/special return_stdout=${EMPTY} return_rc=true
-    Should Be Equal As Integers  ${rc}  0
+    ${stdout} =  Execute Command  ls ${expected}
+    Should Contain  ${stdout}  ${TEST FILE NAME}
+    Should Contain  ${stdout}  ${TEST FILE 2 NAME}
+    Should Contain  ${stdout}  ${FILE WITH NEWLINES NAME}
+    Should Contain  ${stdout}  special
+    ${stdout} =  Execute Command  ls ${expected}/special
+    Should Contain  ${stdout}  ${FILE WITH SPECIAL CHARS NAME}

==============================================================================
Revision: 663eefb1330b
Author:   Anssi Syrjäsalo <anssi.syrjas...@eficode.com>
Date:     Mon Jul 29 07:41:27 2013
Log:      Tidied up test and suite setups and teardowns

http://code.google.com/p/robotframework-sshlibrary/source/detail?r=663eefb1330b

Modified:
 /atest/connections_and_login.txt
 /atest/execute_command.txt
 /atest/get_dir.txt
 /atest/get_file.txt
 /atest/importing_with_args.txt
 /atest/put_file.txt
 /atest/start_command.txt

=======================================
--- /atest/connections_and_login.txt    Mon Jul  1 06:01:29 2013
+++ /atest/connections_and_login.txt    Mon Jul 29 07:41:27 2013
@@ -55,7 +55,7 @@
     Should Contain  ${ret}  Last login

 Enable Logging
-    [Tags]    pybot
+    [Tags]   pybot
     [Setup]  Remove File  ${OUTPUTDIR}/sshlog.txt
     Enable SSH Logging  ${OUTPUTDIR}/sshlog.txt
     Open Connection  ${HOST}
=======================================
--- /atest/execute_command.txt  Wed Jul 10 06:47:18 2013
+++ /atest/execute_command.txt  Mon Jul 29 07:41:27 2013
@@ -1,9 +1,8 @@
 *** Settings ***
-Resource        resources/ssh_library_resources.txt
 Force Tags      pybot   jybot
 Suite Setup     Login and Move Test Files
 Suite Teardown  Remove Test Files and Close Connections
-Test Teardown   Execute Command  rm -f ${TEST FILE NAME}
+Resource        resources/ssh_library_resources.txt

 *** Test Cases ***
 Execute Command With Defaults
=======================================
--- /atest/get_dir.txt  Mon Jul 29 06:11:13 2013
+++ /atest/get_dir.txt  Mon Jul 29 07:41:27 2013
@@ -2,20 +2,21 @@
 Force Tags      pybot   jybot
 Suite Setup     Login and Move Test Files
 Suite Teardown  Remove Test Files and Close Connections
-Test Setup      Create Directory  robot-tmpdir
-Test Teardown   Remove Directory  robot-tmpdir  True
 Resource        resources/ssh_library_resources.txt
 Library         Collections

 *** 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 Using Relative Source
     Get Dir And Verify Content  test_root  robot-tmpdir
+    [Teardown]  Remove Directory  robot-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

 *** Keywords ***
 Get Dir And Verify Content
=======================================
--- /atest/get_file.txt Thu Jul 11 06:04:37 2013
+++ /atest/get_file.txt Mon Jul 29 07:41:27 2013
@@ -2,7 +2,6 @@
 Force Tags      pybot   jybot
 Suite Setup     Login and Move Test Files
 Suite Teardown  Remove Test Files and Close Connections
-Test Setup      Create Directory  ${TMPDIR}
 Test Teardown   Remove Directory  ${TMPDIR}  yes
 Resource        resources/ssh_library_resources.txt

@@ -43,7 +42,6 @@
     [Teardown]  Remove Tmp Dir And Remote File

 Get File To Absolute Destination
-    [Setup]
     SSHLibrary.Get File  ${TEST SCRIPT NAME}  ${CURDIR}${/}${TMPDIR2}${/}
     ${contents} =  List Directory  ${CURDIR}${/}${TMPDIR2}${/}
     Should Contain  ${contents}  ${TEST SCRIPT NAME}
=======================================
--- /atest/importing_with_args.txt      Tue Jun 18 07:34:05 2013
+++ /atest/importing_with_args.txt      Mon Jul 29 07:41:27 2013
@@ -1,6 +1,6 @@
 *** Settings ***
-Library         SSHLibrary  3 minutes 30 seconds  ${EMPTY}  >>
 Force Tags      pybot   jybot
+Library         SSHLibrary  3 minutes 30 seconds  ${EMPTY}  >>

 *** Test Cases ***
 Test Library Args
=======================================
--- /atest/put_file.txt Mon Jul 29 05:34:38 2013
+++ /atest/put_file.txt Mon Jul 29 07:41:27 2013
@@ -1,7 +1,8 @@
 *** Settings ***
+Documentation This suite contains test for 'Put File 'keywords These tests use some dummy test files from under the scripts directory.
 Force Tags      pybot   jybot
 Suite Setup     Login As Valid User
-Suite Teardown Run Keywords Remove Test Files and Close Connections Remove Local Tempdir
+Suite Teardown  Close All Connections
 Resource        resources/ssh_library_resources.txt
 Library         String

@@ -41,7 +42,7 @@
     ${expected}=  OS.Get File  ${FILE WITH NEWLINES}
     ${expected}=  Replace String  ${expected}  \n  \r\n
     Should Be Equal  ${content}  ${expected}
-    [Teardown]  Execute Command  rm -f ${FILE WITH NEWLINES NAME}
+    [Teardown]  Remove Local Temp Dir And Remote File

 Put File With Pattern
Put Files And Verify ${TEST FILE PATTERN} ${USER HOME}/ ${TEST FILE NAME} ${TEST FILE 2 NAME}
@@ -61,7 +62,7 @@
     [Teardown]  Execute Command  rm -rf robotdir

 Put File With Pattern Matching Directory
- Put Files And Verify ${TEXTFILES}/test_fi* ${USER HOME}/ ${TEST FILE NAME} ${TEST FILE 2 NAME} + Put Files And Verify ${TEXTFILES}${/}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
@@ -99,5 +100,6 @@
     : FOR  ${filename}  IN  @{expected}
     \  Should Contain  ${listing}  ${filename}

-Remove Local Tempdir
+Remove Local Temp Dir And Remote File
     Remove Directory  ${TMPDIR}  yes
+    Execute Command  rm -f ${FILE WITH NEWLINES NAME}
=======================================
--- /atest/start_command.txt    Mon Jul 29 06:11:13 2013
+++ /atest/start_command.txt    Mon Jul 29 07:41:27 2013
@@ -2,7 +2,6 @@
 Force Tags      pybot   jybot
 Suite Setup     Login and Move Test Files
 Suite Teardown  Remove Test Files and Close Connections
-Test Teardown   Execute Command  rm -f ${TEST FILE NAME}
 Resource        resources/ssh_library_resources.txt

 *** Test Cases ***

--

--- 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.


Reply via email to