← Back to branch summary

~hazmat/pyjuju/lxc-killpid

« back to all changes in this revision

Viewing changes to juju/control/tests/test_bootstrap.py

Removes duplicate stderr direct output on the cli

Also fixed many tests which relied on it.

A=therve
R=hazmat

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/control/tests/test_bootstrap.py
66
66
        self.setup_exit(1)
67
67
        self.mocker.replay()
68
68
 
69
 
        output = self.capture_stream("stderr")
 
69
        output = self.capture_logging()
70
70
        main(["bootstrap"])
71
71
        yield finished
72
72
        msg = "There are multiple environments and no explicit default"
87
87
        self.setup_exit(1)
88
88
        self.mocker.replay()
89
89
 
90
 
        output = self.capture_stream("stderr")
 
90
        output = self.capture_logging()
91
91
        main(["bootstrap", "-e", "thirdenv"])
92
92
        yield finished
93
93
 
109
109
        self.setup_exit(1)
110
110
        self.mocker.replay()
111
111
 
112
 
        output = self.capture_stream("stderr")
 
112
        output = self.capture_logging()
113
113
        main(["bootstrap"])
114
114
        yield finished
115
115