summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Taylor <kragniz@gmail.com>2014-08-17 20:39:03 +0000
committerLouis Taylor <kragniz@gmail.com>2014-08-18 09:08:42 +0000
commit69361a146ecd0cd775579e5dcf34692e9c6328bc (patch)
tree0f66582f7bc98dc40c8017ac36df511681038bd2
parent1dfce5301c5d7cd456c98629a007917120637c8a (diff)
downloadpython-glanceclient-69361a146ecd0cd775579e5dcf34692e9c6328bc.tar.gz
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
-rw-r--r--tests/v1/test_shell.py26
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/v1/test_shell.py b/tests/v1/test_shell.py
index 6624f9e..fa2cd5f 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 <IMAGE_ID> <TENANT_ID>')
- 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')