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
---
 tests/unittests/test_distros/test_bsd_utils.py | 67 --------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 tests/unittests/test_distros/test_bsd_utils.py

(limited to 'tests/unittests/test_distros/test_bsd_utils.py')

diff --git a/tests/unittests/test_distros/test_bsd_utils.py b/tests/unittests/test_distros/test_bsd_utils.py
deleted file mode 100644
index 3a68f2a9..00000000
--- a/tests/unittests/test_distros/test_bsd_utils.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-import cloudinit.distros.bsd_utils as bsd_utils
-
-from cloudinit.tests.helpers import (CiTestCase, ExitStack, mock)
-
-RC_FILE = """
-if something; then
-    do something here
-fi
-hostname={hostname}
-"""
-
-
-class TestBsdUtils(CiTestCase):
-
-    def setUp(self):
-        super().setUp()
-        patches = ExitStack()
-        self.addCleanup(patches.close)
-
-        self.load_file = patches.enter_context(
-            mock.patch.object(bsd_utils.util, 'load_file'))
-
-        self.write_file = patches.enter_context(
-            mock.patch.object(bsd_utils.util, 'write_file'))
-
-    def test_get_rc_config_value(self):
-        self.load_file.return_value = 'hostname=foo\n'
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), 'foo')
-        self.load_file.assert_called_with('/etc/rc.conf')
-
-        self.load_file.return_value = 'hostname=foo'
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), 'foo')
-
-        self.load_file.return_value = 'hostname="foo"'
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), 'foo')
-
-        self.load_file.return_value = "hostname='foo'"
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), 'foo')
-
-        self.load_file.return_value = 'hostname=\'foo"'
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), "'foo\"")
-
-        self.load_file.return_value = ''
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), None)
-
-        self.load_file.return_value = RC_FILE.format(hostname='foo')
-        self.assertEqual(bsd_utils.get_rc_config_value('hostname'), "foo")
-
-    def test_set_rc_config_value_unchanged(self):
-        # bsd_utils.set_rc_config_value('hostname', 'foo')
-        # self.write_file.assert_called_with('/etc/rc.conf', 'hostname=foo\n')
-
-        self.load_file.return_value = RC_FILE.format(hostname='foo')
-        self.write_file.assert_not_called()
-
-    def test_set_rc_config_value(self):
-        bsd_utils.set_rc_config_value('hostname', 'foo')
-        self.write_file.assert_called_with('/etc/rc.conf', 'hostname=foo\n')
-
-        self.load_file.return_value = RC_FILE.format(hostname='foo')
-        bsd_utils.set_rc_config_value('hostname', 'bar')
-        self.write_file.assert_called_with(
-            '/etc/rc.conf',
-            RC_FILE.format(hostname='bar')
-        )
-- 
cgit v1.2.3