Merge lp://qastaging/~vila/selenium-simple-test/fix-results-directory into lp://qastaging/selenium-simple-test
| Status: | Merged |
|---|---|
| Approved by: | Vincent Ladeuil |
| Approved revision: | 411 |
| Merged at revision: | 416 |
| Proposed branch: | lp://qastaging/~vila/selenium-simple-test/fix-results-directory |
| Merge into: | lp://qastaging/selenium-simple-test |
| Prerequisite: | lp://qastaging/~vila/selenium-simple-test/separate-sst-test |
| Diff against target: |
376 lines (+53/-72) 12 files modified
src/sst/actions.py (+6/-3) src/sst/cases.py (+1/-5) src/sst/command.py (+8/-4) src/sst/loader.py (+3/-1) src/sst/runtests.py (+6/-9) src/sst/scripts/remote.py (+4/-3) src/sst/scripts/run.py (+3/-2) src/sst/scripts/test.py (+5/-2) src/sst/tests/test_runtests.py (+4/-3) src/sst/tests/test_sst_run.py (+2/-2) src/sst/tests/test_sst_script_test_case.py (+11/-11) src/sst/tests/test_sst_test_case.py (+0/-27) |
| To merge this branch: | bzr merge lp://qastaging/~vila/selenium-simple-test/fix-results-directory |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Corey Goldberg (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix 'results' directory handling.
Description of the change
This fixes the results directory handling and remove some old FIXMEs along the way \o/
There are mainly two use cases here:
- sst-run and friends needs the results directory to store results.xml (when needed)
- page dumps and screen shots needs the directory on failures
While I left the config.
Surprisingly, implementing the changes were covered by existing tests and they did indeed fail during the refactoring.
I ended up removing an existing test (and its FIXME) which was pointing out the unwanted side-effect.
So, sst-run and friends unconditionally reset the results directory and SSTTestCase will create it only when needed and as such requires a valid path to start with *only* when the directory will be required (i.e. screen shots or page dumps required) and that last part was covered by the existing tests (only slight and obvious fix there).
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
nice.