1
=== modified file 'autopilot/run.py'
2
--- autopilot/run.py	2014-09-05 04:55:50 +0000
3
+++ autopilot/run.py	2015-03-10 00:23:59 +0000
4
@@ -662,16 +662,6 @@
5
662
662
6
663
    def run_tests(self):
663
    def run_tests(self):
7
664
        """Run tests, using input from `args`."""
664
        """Run tests, using input from `args`."""
8
665
        test_suite, error_encountered = load_test_suite_from_name(
9
666
            self.args.suite
10
667
        )
11
668
12
669
        if not test_suite.countTestCases():
13
670
            raise RuntimeError('Did not find any tests')
14
671
15
672
        if self.args.random_order:
16
673
            shuffle(test_suite._tests)
17
674
            print("Running tests in random order")
18
675
665
19
676
        _configure_debug_profile(self.args)
666
        _configure_debug_profile(self.args)
20
677
        _configure_timeout_profile(self.args)
667
        _configure_timeout_profile(self.args)
21
@@ -688,6 +678,17 @@
22
688
        if self.args.verbose:
678
        if self.args.verbose:
23
689
            autopilot.globals.set_log_verbose(True)
679
            autopilot.globals.set_log_verbose(True)
24
690
680
25
681
        test_suite, error_encountered = load_test_suite_from_name(
26
682
            self.args.suite
27
683
        )
28
684
29
685
        if not test_suite.countTestCases():
30
686
            raise RuntimeError('Did not find any tests')
31
687
32
688
        if self.args.random_order:
33
689
            shuffle(test_suite._tests)
34
690
            print("Running tests in random order")
35
691
36
691
        result = construct_test_result(self.args)
692
        result = construct_test_result(self.args)
37
692
        result.startTestRun()
693
        result.startTestRun()
38
693
        try:
694
        try:
39
694
695
40
=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
41
--- autopilot/tests/functional/test_autopilot_functional.py	2014-07-24 00:24:41 +0000
42
+++ autopilot/tests/functional/test_autopilot_functional.py	2015-03-10 00:23:59 +0000
43
@@ -94,6 +94,31 @@
44
94
94
45
95
class FunctionalTestMain(AutopilotFunctionalTestsBase):
95
class FunctionalTestMain(AutopilotFunctionalTestsBase):
46
96
96
47
97
    def test_config_available_in_decorator(self):
48
98
        """Any commandline config values must be available for decorators."""
49
99
        unique_config_value = self.getUniqueString()
50
100
        self.create_test_file(
51
101
            'test_config_skip.py', dedent("""\
52
102
            from testtools import skipIf
53
103
            import autopilot
54
104
            from autopilot.testcase import AutopilotTestCase
55
105
56
106
            class ConfigTest(AutopilotTestCase):
57
107
                @skipIf(
58
108
                    autopilot.get_test_configuration().get('skipme', None)
59
109
                    == '{unique_config_value}',
60
110
                    'Skipping Test')
61
111
                def test_config(self):
62
112
                    self.fail('Should not run.')
63
113
            """.format(unique_config_value=unique_config_value))
64
114
        )
65
115
66
116
        config_string = 'skipme={}'.format(unique_config_value)
67
117
        code, output, error = self.run_autopilot(
68
118
            ['run', 'tests', '--config', config_string])
69
119
70
120
        self.assertThat(code, Equals(0))
71
121
72
97
    def test_can_list_empty_test_dir(self):
122
    def test_can_list_empty_test_dir(self):
73
98
        """Autopilot list must report 0 tests found with an empty test
123
        """Autopilot list must report 0 tests found with an empty test
74
99
        module."""
124
        module."""
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-03-11
Richard Huddie (community)			Approve on 2015-03-11
Leo Arias (community)		2015-03-05	Approve on 2015-03-10
Review via email: mp+251862@code.launchpad.net