Merge lp:~stevanr/linaro-license-protection/separate-testplans into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Stevan Radaković
Status: Merged
Approved by: Данило Шеган
Approved revision: 75
Merged at revision: 75
Proposed branch: lp:~stevanr/linaro-license-protection/separate-testplans
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 55 lines (+18/-6)
3 files modified
README (+6/-0)
testing/__init__.py (+0/-6)
testplans/__init__.py (+12/-0)
To merge this branch: bzr merge lp:~stevanr/linaro-license-protection/separate-testplans
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Review via email: mp+106177@code.launchpad.net

Description of the change

Rename docs directory to testplans.
Separate production test plans from regular integration/unit tests.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-05-14 10:39:08 +0000
3+++ README 2012-05-17 13:08:17 +0000
4@@ -90,6 +90,12 @@
5 $ testr init
6 $ testr run
7
8+To run the production test plans (NOTE: They will take a bit more time to run)
9+execute the following:
10+
11+ $ testr init
12+ $ testr run testplans.test_suite
13+
14
15 Tests for PHP license-matching logic
16 ....................................
17
18=== modified file 'testing/__init__.py'
19--- testing/__init__.py 2012-05-16 16:30:19 +0000
20+++ testing/__init__.py 2012-05-17 13:08:17 +0000
21@@ -1,6 +1,5 @@
22 import os
23 import unittest
24-import doctest
25
26 from testing.test_click_through_license import *
27 from testing.test_publish_to_snapshots import *
28@@ -14,9 +13,4 @@
29 ]
30 loader = unittest.TestLoader()
31 suite = loader.loadTestsFromNames(module_names)
32- for filename in os.listdir("docs/"):
33- suite.addTest(doctest.DocFileSuite(
34- 'docs/' + filename, module_relative=False,
35- optionflags=doctest.ELLIPSIS)
36- )
37 return suite
38
39=== renamed directory 'docs' => 'testplans'
40=== added file 'testplans/__init__.py'
41--- testplans/__init__.py 1970-01-01 00:00:00 +0000
42+++ testplans/__init__.py 2012-05-17 13:08:17 +0000
43@@ -0,0 +1,12 @@
44+import os
45+import unittest
46+import doctest
47+
48+def test_suite():
49+ suite = unittest.TestSuite()
50+ for filename in os.listdir("testplans/"):
51+ suite.addTest(doctest.DocFileSuite(
52+ 'testplans/' + filename, module_relative=False,
53+ optionflags=doctest.ELLIPSIS)
54+ )
55+ return suite

Subscribers

People subscribed via source and target branches