summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-18 13:48:01 +0000
committerGerrit Code Review <review@openstack.org>2014-08-18 13:48:01 +0000
commitc59ba203dda65b949c49aa480685bec1a344374c (patch)
tree158ee596971bcba26afc6866809723f5d9879912
parentfa6eca864553e70b80b8680b9616201adc54a16b (diff)
parent69361a146ecd0cd775579e5dcf34692e9c6328bc (diff)
downloadpython-glanceclient-c59ba203dda65b949c49aa480685bec1a344374c.tar.gz
Merge "Hide stderr noise in test output"
-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')