← Back to branch summary

~hazmat/pyjuju/lxc-killpid

« back to all changes in this revision

Viewing changes to juju/control/tests/test_deploy.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_deploy.py
59
59
                    "type": "dummy", "admin-secret": "marge"}}}
60
60
 
61
61
        self.write_config(yaml.dump(config))
62
 
        stderr = self.capture_stream("stderr")
 
62
        stderr = self.capture_logging()
63
63
        main(["deploy", "--repository", self.unbundled_repo_path, "mysql"])
64
64
        self.assertIn("There are multiple environments", stderr.getvalue())
65
65
 
69
69
        self.setup_exit(1)
70
70
        self.mocker.replay()
71
71
 
72
 
        stderr = self.capture_stream("stderr")
 
72
        stderr = self.capture_logging()
73
73
        main(["deploy", "local:redis"])
74
74
        self.assertIn("No repository specified", stderr.getvalue())
75
75
 
82
82
        self.setup_exit(1)
83
83
        self.mocker.replay()
84
84
 
85
 
        stderr = self.capture_stream("stderr")
 
85
        stderr = self.capture_logging()
86
86
        main([
87
87
            "deploy", "local:redis"])
88
88
        self.assertNotIn("No repository specified", stderr.getvalue())
93
93
        self.setup_exit(1)
94
94
        self.mocker.replay()
95
95
 
96
 
        stderr = self.capture_stream("stderr")
 
96
        stderr = self.capture_logging()
97
97
        main([
98
98
            "deploy", "--repository", self.unbundled_repo_path, "local:redis"])
99
99
        self.assertIn(
106
106
        self.setup_exit(1)
107
107
        self.mocker.replay()
108
108
 
109
 
        stderr = self.capture_stream("stderr")
 
109
        stderr = self.capture_logging()
110
110
        main([
111
111
            "deploy", "--repository", self.unbundled_repo_path, "local:sample",
112
112
            "--constraints", "arch=arm tweedledee tweedledum"])
169
169
 
170
170
        self.write_config(yaml.dump(config))
171
171
 
172
 
        stderr = self.capture_stream("stderr")
 
172
        stderr = self.capture_logging()
173
173
        main(["deploy", "--environment", "roman-candle",
174
174
              "--repository", self.unbundled_repo_path, "sample"])
175
175
        self.assertIn("Invalid environment 'roman-candle'", stderr.getvalue())
379
379
 
380
380
    def test_deploy_missing_config(self):
381
381
        """Missing config files should prevent the deployment"""
382
 
        stderr = self.capture_stream("stderr")
 
382
        stderr = self.capture_logging()
383
383
        self.setup_cli_reactor()
384
384
        self.setup_exit(1)
385
385
        self.mocker.replay()
560
560
        finished = self.setup_cli_reactor()
561
561
        self.setup_exit(0)
562
562
        self.mocker.replay()
563
 
        stderr = self.capture_stream("stderr")
 
563
        stderr = self.capture_logging()
564
564
 
565
565
        main(["deploy", "--repository", self.unbundled_repo_path,
566
566
              "local:sample", "beekeeper"])
581
581
        finished = self.setup_cli_reactor()
582
582
        self.setup_exit(0)
583
583
        self.mocker.replay()
584
 
        stderr = self.capture_stream("stderr")
 
584
        stderr = self.capture_logging()
585
585
 
586
586
        main(["deploy", "--repository", self.unbundled_repo_path,
587
587
              "local:sample", "beekeeper", "--constraints", "arch=i386"])