commit e8b0e154aa00cc48a0386e122923897723523155
author Joe Gordon <jogo@cloudscaling.com> Mon Mar 25 13:37:15 2013 -0400
committer Joe Gordon <jogo@cloudscaling.com> Mon Mar 25 14:45:39 2013 -0400
tree cfb325f874ba88524c02ee73b98563899d901314
parent ccebcd1759644e17a5c549a787fb9c0ce5a698e7

Fix SimpleReadOnlyNovaManageTest.test_flavor_list CLI test

'nova-manage flavor list' should equal 'nova-manage instance_type list'

Adds an option, merge_stderr, that when enabled redirects stderr to
stdout.

Fix bug 1159914

Change-Id: Icfb93f3fd1f1d6f14a73b4873a6dad36122d3a98

cli/simple_read_only/test_compute_manage.py

diff --git a/cli/simple_read_only/test_compute_manage.py b/cli/simple_read_only/test_compute_manage.py
index 5768c74..0fa84bd 100644
--- a/cli/simple_read_only/test_compute_manage.py
+++ b/cli/simple_read_only/test_compute_manage.py
@@ -50,6 +50,7 @@
         self.nova_manage('', '-h')
 
     def test_version_flag(self):
+        # Bug 1159957: nova-manage --version writes to stderr
         self.assertNotEqual("", self.nova_manage('', '--version'))
         self.assertEqual(self.nova_manage('version'),
                          self.nova_manage('', '--version'))
@@ -68,8 +69,9 @@
 
     def test_flavor_list(self):
         self.assertNotEqual("", self.nova_manage('flavor list'))
-        self.assertNotEqual(self.nova_manage('instance_type list'),
-                            self.nova_manage('flavor list'))
+        self.assertEqual(self.nova_manage('instance_type list',
+                                          merge_stderr=False),
+                         self.nova_manage('flavor list', merge_stderr=False))
 
     def test_db_archive_deleted_rows(self):
         # make sure command doesn't error out