Remove no longer required "inner" methods.

Previously we were testing by using methods without decorators,
which were labelled as "inner" methods. We don't need to do that
now that we can fixture away the decorator.

Change-Id: I9b21e8a0f9a0ed9e70d1fc07e60a6beff110c19c

Author: mikalstill

nova/privsep/linux_net.py

@@ -66,20 +66,12 @@ def delete_net_dev(dev):
 
 @nova.privsep.sys_admin_pctxt.entrypoint
 def delete_net_dev_escalated(dev):
-    _delete_net_dev_inner(dev)
-
-
-def _delete_net_dev_inner(dev):
     processutils.execute('ip', 'link', 'delete', dev,
                          check_exit_code=[0, 2, 254])
 
 
 @nova.privsep.sys_admin_pctxt.entrypoint
 def set_device_mtu(dev, mtu):
-    _set_device_mtu_inner(dev, mtu)
-
-
-def _set_device_mtu_inner(dev, mtu):
     if mtu:
         processutils.execute('ip', 'link', 'set', dev, 'mtu',
                              mtu, check_exit_code=[0, 2, 254])
@@ -200,11 +192,6 @@ def route_delete_deprecated(dev, routes):
 
 @nova.privsep.sys_admin_pctxt.entrypoint
 def create_tap_dev(dev, mac_address=None, multiqueue=False):
-    _create_tap_dev_inner(dev, mac_address=mac_address,
-                          multiqueue=multiqueue)
-
-
-def _create_tap_dev_inner(dev, mac_address=None, multiqueue=False):
     if not device_exists(dev):
         try:
             # First, try with 'ip'

nova/privsep/path.py

@@ -94,32 +94,24 @@ def exists(path):
 
 @nova.privsep.sys_admin_pctxt.entrypoint
 def last_bytes(path, num):
-    # NOTE(mikal): this is implemented in this contrived manner because you
-    # can't mock a decorator in python (they're loaded at file parse time,
-    # and the mock happens later).
-    with open(path, 'rb') as f:
-        return _last_bytes_inner(f, num)
-
-
-def _last_bytes_inner(file_like_object, num):
     """Return num bytes from the end of the file, and remaining byte count.
 
-    :param file_like_object: The file to read
+    :param path: The file to read
     :param num: The number of bytes to return
 
     :returns: (data, remaining)
     """
-
-    try:
-        file_like_object.seek(-num, os.SEEK_END)
-    except IOError as e:
-        # seek() fails with EINVAL when trying to go before the start of
-        # the file. It means that num is larger than the file size, so
-        # just go to the start.
-        if e.errno == errno.EINVAL:
-            file_like_object.seek(0, os.SEEK_SET)
-        else:
-            raise
-
-    remaining = file_like_object.tell()
-    return (file_like_object.read(), remaining)
+    with open(path, 'rb') as f:
+        try:
+            f.seek(-num, os.SEEK_END)
+        except IOError as e:
+            # seek() fails with EINVAL when trying to go before the start of
+            # the file. It means that num is larger than the file size, so
+            # just go to the start.
+            if e.errno == errno.EINVAL:
+                f.seek(0, os.SEEK_SET)
+            else:
+                raise
+
+        remaining = f.tell()
+        return (f.read(), remaining)

nova/tests/unit/privsep/test_linux_net.py

@@ -19,22 +19,34 @@
 
 import nova.privsep.linux_net
 from nova import test
+from nova.tests import fixtures
 
 
 class LinuxNetTestCase(test.NoDBTestCase):
     """Test networking helpers."""
 
+    def setUp(self):
+        super(LinuxNetTestCase, self).setUp()
+        self.useFixture(fixtures.PrivsepFixture())
+
     @mock.patch('oslo_concurrency.processutils.execute',
                 return_value=('', ''))
     def test_set_device_mtu_default(self, mock_exec):
-        calls = []
-        nova.privsep.linux_net._set_device_mtu_inner('fake-dev', None)
-        mock_exec.assert_has_calls(calls)
+        nova.privsep.linux_net.set_device_mtu('fake-dev', None)
+        mock_exec.assert_has_calls([])
+
+    @mock.patch('oslo_concurrency.processutils.execute',
+                return_value=('', ''))
+    def test_set_device_mtu_actual(self, mock_exec):
+        nova.privsep.linux_net.set_device_mtu('fake-dev', 1500)
+        mock_exec.assert_has_calls([
+            mock.call('ip', 'link', 'set', 'fake-dev', 'mtu',
+                      1500, check_exit_code=[0, 2, 254])])
 
     @mock.patch('oslo_concurrency.processutils.execute')
     @mock.patch('nova.privsep.linux_net._set_device_enabled_inner')
     def test_create_tap_dev(self, mock_enabled, mock_execute):
-        nova.privsep.linux_net._create_tap_dev_inner('tap42')
+        nova.privsep.linux_net.create_tap_dev('tap42')
 
         mock_execute.assert_has_calls([
             mock.call('ip', 'tuntap', 'add', 'tap42', 'mode', 'tap',
@@ -45,7 +57,7 @@ def test_create_tap_dev(self, mock_enabled, mock_execute):
     @mock.patch('os.path.exists', return_value=True)
     @mock.patch('oslo_concurrency.processutils.execute')
     def test_create_tap_skipped_when_exists(self, mock_execute, mock_exists):
-        nova.privsep.linux_net._create_tap_dev_inner('tap42')
+        nova.privsep.linux_net.create_tap_dev('tap42')
 
         mock_exists.assert_called_once_with('/sys/class/net/tap42')
         mock_execute.assert_not_called()
@@ -55,7 +67,7 @@ def test_create_tap_skipped_when_exists(self, mock_execute, mock_exists):
     @mock.patch('nova.privsep.linux_net._set_device_macaddr_inner')
     def test_create_tap_dev_mac(self, mock_set_macaddr, mock_enabled,
                                 mock_execute):
-        nova.privsep.linux_net._create_tap_dev_inner(
+        nova.privsep.linux_net.create_tap_dev(
             'tap42', '00:11:22:33:44:55')
 
         mock_execute.assert_has_calls([
@@ -73,7 +85,7 @@ def test_create_tap_dev_fallback_to_tunctl(self, mock_enabled,
         # ip failed, fall back to tunctl
         mock_execute.side_effect = [processutils.ProcessExecutionError, 0, 0]
 
-        nova.privsep.linux_net._create_tap_dev_inner('tap42')
+        nova.privsep.linux_net.create_tap_dev('tap42')
 
         mock_execute.assert_has_calls([
             mock.call('ip', 'tuntap', 'add', 'tap42', 'mode', 'tap',
@@ -85,7 +97,7 @@ def test_create_tap_dev_fallback_to_tunctl(self, mock_enabled,
     @mock.patch('oslo_concurrency.processutils.execute')
     @mock.patch('nova.privsep.linux_net._set_device_enabled_inner')
     def test_create_tap_dev_multiqueue(self, mock_enabled, mock_execute):
-        nova.privsep.linux_net._create_tap_dev_inner(
+        nova.privsep.linux_net.create_tap_dev(
             'tap42', multiqueue=True)
 
         mock_execute.assert_has_calls([
@@ -101,5 +113,5 @@ def test_create_tap_dev_multiqueue_tunctl_raises(self, mock_execute):
         mock_execute.side_effect = processutils.ProcessExecutionError
         # but tunctl can't create multiqueue taps, so the failure is expected
         self.assertRaises(processutils.ProcessExecutionError,
-                          nova.privsep.linux_net._create_tap_dev_inner,
+                          nova.privsep.linux_net.create_tap_dev,
                           'tap42', multiqueue=True)

nova/tests/unit/privsep/test_path.py

@@ -146,25 +146,30 @@ class LastBytesTestCase(test.NoDBTestCase):
 
     def setUp(self):
         super(LastBytesTestCase, self).setUp()
-        self.f = six.BytesIO(b'1234567890')
+        self.useFixture(fixtures.PrivsepFixture())
 
     def test_truncated(self):
-        self.f.seek(0, os.SEEK_SET)
-        out, remaining = nova.privsep.path._last_bytes_inner(self.f, 5)
-        self.assertEqual(out, b'67890')
-        self.assertGreater(remaining, 0)
+        try:
+            fd, path = tempfile.mkstemp()
+            os.write(fd, b'1234567890')
+            os.close(fd)
+
+            out, remaining = nova.privsep.path.last_bytes(path, 5)
+            self.assertEqual(out, b'67890')
+            self.assertGreater(remaining, 0)
+
+        finally:
+            os.unlink(path)
 
     def test_read_all(self):
-        self.f.seek(0, os.SEEK_SET)
-        out, remaining = nova.privsep.path._last_bytes_inner(self.f, 1000)
-        self.assertEqual(out, b'1234567890')
-        self.assertFalse(remaining > 0)
-
-    def test_seek_too_far_real_file(self):
-        # StringIO doesn't raise IOError if you see past the start of the file.
-        with tempfile.TemporaryFile() as flo:
-            content = b'1234567890'
-            flo.write(content)
-            self.assertEqual(
-                (content, 0),
-                nova.privsep.path._last_bytes_inner(flo, 1000))
+        try:
+            fd, path = tempfile.mkstemp()
+            os.write(fd, b'1234567890')
+            os.close(fd)
+
+            out, remaining = nova.privsep.path.last_bytes(path, 1000)
+            self.assertEqual(out, b'1234567890')
+            self.assertFalse(remaining > 0)
+
+        finally:
+            os.unlink(path)

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

@@ -79,6 +79,7 @@
 import nova.privsep.fs
 import nova.privsep.libvirt
 from nova import test
+from nova.tests import fixtures as nova_fixtures
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_diagnostics
 from nova.tests.unit import fake_flavor
@@ -13881,6 +13882,8 @@ def test_get_console_output_not_available(self, mock_get_xml, get_domain):
     @mock.patch('nova.virt.libvirt.host.Host._get_domain')
     @mock.patch.object(libvirt_guest.Guest, 'get_xml_desc')
     def test_get_console_output_logrotate(self, mock_get_xml, get_domain):
+        self.useFixture(nova_fixtures.PrivsepFixture())
+
         fake_files = {}
         fake_files['console.log'] = b'uvwxyz'
         fake_files['console.log.0'] = b'klmnopqrst'
@@ -13889,9 +13892,14 @@ def test_get_console_output_logrotate(self, mock_get_xml, get_domain):
         def mock_path_exists(path):
             return os.path.basename(path) in fake_files
 
-        def mock_last_bytes(path, count):
-            flo = io.BytesIO(fake_files[os.path.basename(path)])
-            return nova.privsep.path._last_bytes_inner(flo, count)
+        def fake_open(path, mode):
+            if path.endswith('console.log'):
+                return io.BytesIO(b'uvwxyz')
+            if path.endswith('console.log.0'):
+                return io.BytesIO(b'klmnopqrst')
+            if path.endswith('console.log.1'):
+                return io.BytesIO(b'abcdefghij')
+            raise Exception('No such file in testing')
 
         xml = """
         <domain type='kvm'>
@@ -13919,12 +13927,13 @@ def _get_logd_output(bytes_to_read):
                 try:
                     prev_max = libvirt_driver.MAX_CONSOLE_BYTES
                     libvirt_driver.MAX_CONSOLE_BYTES = bytes_to_read
-                    with mock.patch('os.path.exists',
-                                    side_effect=mock_path_exists):
-                        with mock.patch('nova.privsep.path.last_bytes',
-                                        side_effect=mock_last_bytes):
-                            log_data = drvr.get_console_output(self.context,
-                                                               instance)
+                    with test.nested(
+                            mock.patch('os.path.exists',
+                                       side_effect=mock_path_exists),
+                            mock.patch.object(six.moves.builtins, 'open',
+                                              fake_open)):
+                        log_data = drvr.get_console_output(self.context,
+                                                           instance)
                 finally:
                     libvirt_driver.MAX_CONSOLE_BYTES = prev_max
                 return log_data