From 69361a146ecd0cd775579e5dcf34692e9c6328bc Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Aug 2014 20:39:03 +0000 Subject: [PATCH] Hide stderr noise in test output Previously, some tests caused the usage options for glance to be printed out to stderr. This patch redirects the stderr output for those unnecessarily verbose test functions. Change-Id: I781d35a16a97c9c093cb17288ebd96d3e1a2e4e9 Closes-Bug: #1334655 --- tests/v1/test_shell.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/v1/test_shell.py b/tests/v1/test_shell.py index 6624f9e8..fa2cd5fe 100644 --- a/tests/v1/test_shell.py +++ b/tests/v1/test_shell.py @@ -22,6 +22,8 @@ import subprocess import tempfile import testtools +import mock + from glanceclient import exc from glanceclient import shell @@ -263,42 +265,50 @@ class ShellInvalidEndpointandParameterTest(utils.TestCase): self.run_command, 'member-delete ') - def test_image_create_invalid_size_parameter(self): + @mock.patch('sys.stderr') + def test_image_create_invalid_size_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-create --size 10gb') - def test_image_create_invalid_ram_parameter(self): + @mock.patch('sys.stderr') + def test_image_create_invalid_ram_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-create --min-ram 10gb') - def test_image_create_invalid_min_disk_parameter(self): + @mock.patch('sys.stderr') + def test_image_create_invalid_min_disk_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-create --min-disk 10gb') - def test_image_update_invalid_size_parameter(self): + @mock.patch('sys.stderr') + def test_image_update_invalid_size_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-update --size 10gb') - def test_image_update_invalid_min_disk_parameter(self): + @mock.patch('sys.stderr') + def test_image_update_invalid_min_disk_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-update --min-disk 10gb') - def test_image_update_invalid_ram_parameter(self): + @mock.patch('sys.stderr') + def test_image_update_invalid_ram_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-update --min-ram 10gb') - def test_image_list_invalid_min_size_parameter(self): + @mock.patch('sys.stderr') + def test_image_list_invalid_min_size_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-list --size-min 10gb') - def test_image_list_invalid_max_size_parameter(self): + @mock.patch('sys.stderr') + def test_image_list_invalid_max_size_parameter(self, __): self.assertRaises( SystemExit, self.run_command, 'image-list --size-max 10gb')