From 039c40f9b3d88ee8158604bb18ca4bf2fb5d5e51 Mon Sep 17 00:00:00 2001
From: Brett Holman <bholman.devel@gmail.com>
Date: Fri, 3 Dec 2021 13:11:46 -0700
Subject: 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
---
 .../test_handler_write_files_deferred.py           | 77 ----------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 tests/unittests/test_handler/test_handler_write_files_deferred.py

(limited to 'tests/unittests/test_handler/test_handler_write_files_deferred.py')

diff --git a/tests/unittests/test_handler/test_handler_write_files_deferred.py b/tests/unittests/test_handler/test_handler_write_files_deferred.py
deleted file mode 100644
index 57b6934a..00000000
--- a/tests/unittests/test_handler/test_handler_write_files_deferred.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-import tempfile
-import shutil
-
-from cloudinit.config.cc_write_files_deferred import (handle)
-from .test_handler_write_files import (VALID_SCHEMA)
-from cloudinit import log as logging
-from cloudinit import util
-
-from cloudinit.tests.helpers import (
-    CiTestCase, FilesystemMockingTestCase, mock, skipUnlessJsonSchema)
-
-LOG = logging.getLogger(__name__)
-
-
-@skipUnlessJsonSchema()
-@mock.patch('cloudinit.config.cc_write_files_deferred.write_files')
-class TestWriteFilesDeferredSchema(CiTestCase):
-
-    with_logs = True
-
-    def test_schema_validation_warns_invalid_value(self,
-                                                   m_write_files_deferred):
-        """If 'defer' is defined, it must be of type 'bool'."""
-
-        valid_config = {
-            'write_files': [
-                {**VALID_SCHEMA.get('write_files')[0], 'defer': True}
-            ]
-        }
-
-        invalid_config = {
-            'write_files': [
-                {**VALID_SCHEMA.get('write_files')[0], 'defer': str('no')}
-            ]
-        }
-
-        cc = self.tmp_cloud('ubuntu')
-        handle('cc_write_files_deferred', valid_config, cc, LOG, [])
-        self.assertNotIn('Invalid config:', self.logs.getvalue())
-        handle('cc_write_files_deferred', invalid_config, cc, LOG, [])
-        self.assertIn('Invalid config:', self.logs.getvalue())
-        self.assertIn("defer: 'no' is not of type 'boolean'",
-                      self.logs.getvalue())
-
-
-class TestWriteFilesDeferred(FilesystemMockingTestCase):
-
-    with_logs = True
-
-    def setUp(self):
-        super(TestWriteFilesDeferred, self).setUp()
-        self.tmp = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.tmp)
-
-    def test_filtering_deferred_files(self):
-        self.patchUtils(self.tmp)
-        expected = "hello world\n"
-        config = {
-            'write_files': [
-                {
-                    'path': '/tmp/deferred.file',
-                    'defer': True,
-                    'content': expected
-                },
-                {'path': '/tmp/not_deferred.file'}
-            ]
-        }
-        cc = self.tmp_cloud('ubuntu')
-        handle('cc_write_files_deferred', config, cc, LOG, [])
-        self.assertEqual(util.load_file('/tmp/deferred.file'), expected)
-        with self.assertRaises(FileNotFoundError):
-            util.load_file('/tmp/not_deferred.file')
-
-
-# vi: ts=4 expandtab
-- 
cgit v1.2.3