Reorganize unit test locations under tests/unittests (#1126)

This attempts to standardize unit test file location under test/unittests/
such that any source file located at cloudinit/path/to/file.py may have a
corresponding unit test file at test/unittests/path/to/test_file.py.

Noteworthy Comments:
====================
Four different duplicate test files existed:
test_{gpg,util,cc_mounts,cc_resolv_conf}.py
Each of these duplicate file pairs has been merged together. This is a
break in git history for these files.

The test suite appears to have a dependency on test order. Changing test
order causes some tests to fail. This should be rectified, but for now
some tests have been modified in
tests/unittests/config/test_set_passwords.py.

A helper class name starts with "Test" which causes pytest to try
executing it as a test case, which then throws warnings "due to Class
having __init__()".  Silence by changing the name of the class.

# helpers.py is imported in many test files, import paths change
cloudinit/tests/helpers.py -> tests/unittests/helpers.py

# Move directories:
cloudinit/distros/tests -> tests/unittests/distros
cloudinit/cmd/devel/tests -> tests/unittests/cmd/devel
cloudinit/cmd/tests -> tests/unittests/cmd/
cloudinit/sources/helpers/tests -> tests/unittests/sources/helpers
cloudinit/sources/tests -> tests/unittests/sources
cloudinit/net/tests -> tests/unittests/net
cloudinit/config/tests -> tests/unittests/config
cloudinit/analyze/tests/ -> tests/unittests/analyze/

# Standardize tests already in tests/unittests/
test_datasource -> sources
test_distros -> distros
test_vmware -> sources/vmware
test_handler -> config        # this contains cloudconfig module tests
test_runs -> runs

1 files changed, 0 insertions, 105 deletions

diff --git a/tests/unittests/test_handler/test_handler_resolv_conf.py b/tests/unittests/test_handler/test_handler_resolv_conf.py
deleted file mode 100644
index 96139001..00000000
--- a/tests/unittests/test_handler/test_handler_resolv_conf.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-from cloudinit.config import cc_resolv_conf
-
-from cloudinit import cloud
-from cloudinit import distros
-from cloudinit import helpers
-from cloudinit import util
-from copy import deepcopy
-
-from cloudinit.tests import helpers as t_help
-
-import logging
-import os
-import shutil
-import tempfile
-from unittest import mock
-
-LOG = logging.getLogger(__name__)
-
-
-class TestResolvConf(t_help.FilesystemMockingTestCase):
-    with_logs = True
-    cfg = {'manage_resolv_conf': True, 'resolv_conf': {}}
-
-    def setUp(self):
-        super(TestResolvConf, self).setUp()
-        self.tmp = tempfile.mkdtemp()
-        util.ensure_dir(os.path.join(self.tmp, 'data'))
-        self.addCleanup(shutil.rmtree, self.tmp)
-
-    def _fetch_distro(self, kind, conf=None):
-        cls = distros.fetch(kind)
-        paths = helpers.Paths({'cloud_dir': self.tmp})
-        conf = {} if conf is None else conf
-        return cls(kind, conf, paths)
-
-    def call_resolv_conf_handler(self, distro_name, conf, cc=None):
-        if not cc:
-            ds = None
-            distro = self._fetch_distro(distro_name, conf)
-            paths = helpers.Paths({'cloud_dir': self.tmp})
-            cc = cloud.Cloud(ds, paths, {}, distro, None)
-        cc_resolv_conf.handle('cc_resolv_conf', conf, cc, LOG, [])
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_resolv_conf_systemd_resolved(self, m_render_to_file):
-        self.call_resolv_conf_handler('photon', self.cfg)
-
-        assert [
-            mock.call(mock.ANY, '/etc/systemd/resolved.conf', mock.ANY)
-        ] == m_render_to_file.call_args_list
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_resolv_conf_no_param(self, m_render_to_file):
-        tmp = deepcopy(self.cfg)
-        self.logs.truncate(0)
-        tmp.pop('resolv_conf')
-        self.call_resolv_conf_handler('photon', tmp)
-
-        self.assertIn('manage_resolv_conf True but no parameters provided',
-                      self.logs.getvalue())
-        assert [
-            mock.call(mock.ANY, '/etc/systemd/resolved.conf', mock.ANY)
-        ] not in m_render_to_file.call_args_list
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_resolv_conf_manage_resolv_conf_false(self, m_render_to_file):
-        tmp = deepcopy(self.cfg)
-        self.logs.truncate(0)
-        tmp['manage_resolv_conf'] = False
-        self.call_resolv_conf_handler('photon', tmp)
-        self.assertIn("'manage_resolv_conf' present but set to False",
-                      self.logs.getvalue())
-        assert [
-            mock.call(mock.ANY, '/etc/systemd/resolved.conf', mock.ANY)
-        ] not in m_render_to_file.call_args_list
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_resolv_conf_etc_resolv_conf(self, m_render_to_file):
-        self.call_resolv_conf_handler('rhel', self.cfg)
-
-        assert [
-            mock.call(mock.ANY, '/etc/resolv.conf', mock.ANY)
-        ] == m_render_to_file.call_args_list
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_resolv_conf_invalid_resolve_conf_fn(self, m_render_to_file):
-        ds = None
-        distro = self._fetch_distro('rhel', self.cfg)
-        paths = helpers.Paths({'cloud_dir': self.tmp})
-        cc = cloud.Cloud(ds, paths, {}, distro, None)
-        cc.distro.resolve_conf_fn = 'bla'
-
-        self.logs.truncate(0)
-        self.call_resolv_conf_handler('rhel', self.cfg, cc)
-
-        self.assertIn('No template found, not rendering resolve configs',
-                      self.logs.getvalue())
-
-        assert [
-            mock.call(mock.ANY, '/etc/resolv.conf', mock.ANY)
-        ] not in m_render_to_file.call_args_list
-
-# vi: ts=4 expandtab