Merge "Fix functional tests and mypy on macOS"

Author: Zuul

nova/tests/fixtures/libvirt.py

@@ -2721,6 +2721,11 @@ def setUp(self):
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.driver.sys.platform', 'linux'))
 
+        # mock /proc/meminfo access
+        self.useFixture(fixtures.MockPatch(
+            'nova.virt.libvirt.host.Host._get_avail_memory_kb',
+            return_value=10 * 1024 * 1024))  # 10 GB
+
         real_exists = os.path.exists
 
         def fake_exists(path):

nova/tests/unit/virt/libvirt/test_host.py

@@ -1135,23 +1135,11 @@ def test_get_memory_total_file_backed(self):
         self.assertEqual(1048576, self.host.get_memory_mb_total())
 
     def test_get_memory_used(self):
-        m = mock.mock_open(read_data="""
-MemTotal:       16194180 kB
-MemFree:          233092 kB
-MemAvailable:    8892356 kB
-Buffers:          567708 kB
-Cached:          8362404 kB
-SwapCached:            0 kB
-Active:          8381604 kB
-""")
-        with test.nested(
-            mock.patch('builtins.open', m, create=True),
-            mock.patch.object(host.Host, "get_connection"),
-        ) as (mock_file, mock_conn):
+        with mock.patch.object(host.Host, "get_connection") as mock_conn:
             mock_conn().getInfo.return_value = [
                 obj_fields.Architecture.X86_64, 15814, 8, 1208, 1, 1, 4, 2]
 
-            self.assertEqual(6866, self.host.get_memory_mb_used())
+            self.assertEqual(5574, self.host.get_memory_mb_used())
 
     def test_sum_domain_memory_mb_file_backed(self):
         class DiagFakeDomain(object):

pyproject.toml

@@ -126,6 +126,7 @@ ignore_errors = true
 
 [tool.mypy]
 python_version = "3.10"
+platform = "linux"
 show_column_numbers = true
 show_error_context = true
 ignore_missing_imports = true