Merge "Use fake_libvirt_utils for libvirt console tests." into stable…

…/essex

nova/tests/fake_libvirt_utils.py

@@ -14,6 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
 import StringIO
 
 files = {}
@@ -89,7 +90,11 @@ def file_open(path, mode=None):
 
 
 def load_file(path):
-    return ''
+    if os.path.exists(path):
+        with open(path, 'r+') as fp:
+            return fp.read()
+    else:
+        return ''
 
 
 def file_delete(path):

nova/tests/test_libvirt.py

@@ -1330,7 +1330,6 @@ def fake_none(self, instance):
             shutil.rmtree(os.path.join(FLAGS.instances_path,
                                        FLAGS.base_dir_name))
 
-    @test.skip_if(missing_libvirt(), "Test requires libvirt")
     def test_get_console_output_file(self):
 
         with utils.tempdir() as tmpdir:
@@ -1365,13 +1364,12 @@ def fake_lookup(id):
 
             self.create_fake_libvirt_mock()
             connection.LibvirtConnection._conn.lookupByName = fake_lookup
-            connection.libvirt_utils = libvirt_utils
+            connection.libvirt_utils = fake_libvirt_utils
 
             conn = connection.LibvirtConnection(False)
             output = conn.get_console_output(instance)
             self.assertEquals("foo", output)
 
-    @test.skip_if(missing_libvirt(), "Test requires libvirt")
     def test_get_console_output_pty(self):
 
         with utils.tempdir() as tmpdir:
@@ -1404,9 +1402,14 @@ def test_get_console_output_pty(self):
             def fake_lookup(id):
                 return FakeVirtDomain(fake_dom_xml)
 
+            def _fake_flush(self, fake_pty):
+                with open(fake_pty, 'r+') as fp:
+                    return fp.read()
+
             self.create_fake_libvirt_mock()
             connection.LibvirtConnection._conn.lookupByName = fake_lookup
-            connection.libvirt_utils = libvirt_utils
+            connection.LibvirtConnection._flush_libvirt_console = _fake_flush
+            connection.libvirt_utils = fake_libvirt_utils
 
             conn = connection.LibvirtConnection(False)
             output = conn.get_console_output(instance)