Merge lp:~elopio/selenium-simple-test/shared into lp:selenium-simple-test

Proposed by Leo Arias
Status: Superseded
Proposed branch: lp:~elopio/selenium-simple-test/shared
Merge into: lp:selenium-simple-test
Diff against target: 19 lines (+3/-0)
2 files modified
src/sst/runtests.py (+1/-0)
src/sst/selftests/shared/subdir/fail.py (+2/-0)
To merge this branch: bzr merge lp:~elopio/selenium-simple-test/shared
Reviewer Review Type Date Requested Status
Canonical ISD QA Team Pending
Review via email: mp+83060@code.launchpad.net

This proposal has been superseded by a proposal from 2011-12-08.

Commit message

Ignore subdirectories of the shared directory while looking for tests (Fixes LP: #893698)

Description of the change

Ignore subdirectories of the shared directory while looking for tests (Fixes LP: #893698)
Comes with a self test for Corey's enjoyment.

To post a comment you must log in.
217. By Leo Arias

Merged with trunk.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sst/runtests.py'
2--- src/sst/runtests.py 2011-11-21 22:29:20 +0000
3+++ src/sst/runtests.py 2011-11-22 18:58:23 +0000
4@@ -74,6 +74,7 @@
5 )
6 for root, _, _ in os.walk(test_dir, followlinks=True)
7 if os.path.abspath(root) != shared_directory and
8+ not os.path.abspath(root).startswith(shared_directory+os.path.sep) and
9 not os.path.split(root)[1].startswith('_')
10 )
11
12
13=== added directory 'src/sst/selftests/shared/subdir'
14=== added file 'src/sst/selftests/shared/subdir/fail.py'
15--- src/sst/selftests/shared/subdir/fail.py 1970-01-01 00:00:00 +0000
16+++ src/sst/selftests/shared/subdir/fail.py 2011-11-22 18:58:23 +0000
17@@ -0,0 +1,2 @@
18+raise AssertionError('files in a subdirectory of the shared directory '
19+ 'should not be run')

Subscribers

People subscribed via source and target branches