summaryrefslogtreecommitdiff
path: root/tests/unittests/test_distros/test_dragonflybsd.py
diff options
context:
space:
mode:
authorBrett Holman <bholman.devel@gmail.com>2021-12-03 13:11:46 -0700
committerGitHub <noreply@github.com>2021-12-03 13:11:46 -0700
commit039c40f9b3d88ee8158604bb18ca4bf2fb5d5e51 (patch)
tree5f1b09486ccaf98ee8159de58d9a2a1ef0af5dc1 /tests/unittests/test_distros/test_dragonflybsd.py
parentffa6fc88249aa080aa31811a45569a45e567418a (diff)
downloadvyos-cloud-init-039c40f9b3d88ee8158604bb18ca4bf2fb5d5e51.tar.gz
vyos-cloud-init-039c40f9b3d88ee8158604bb18ca4bf2fb5d5e51.zip
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
Diffstat (limited to 'tests/unittests/test_distros/test_dragonflybsd.py')
-rw-r--r--tests/unittests/test_distros/test_dragonflybsd.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/tests/unittests/test_distros/test_dragonflybsd.py b/tests/unittests/test_distros/test_dragonflybsd.py
deleted file mode 100644
index df2c00f4..00000000
--- a/tests/unittests/test_distros/test_dragonflybsd.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-
-
-import cloudinit.util
-from cloudinit.tests.helpers import mock
-
-
-def test_find_dragonflybsd_part():
- assert cloudinit.util.find_dragonflybsd_part("/dev/vbd0s3") == "vbd0s3"
-
-
-@mock.patch("cloudinit.util.is_DragonFlyBSD")
-@mock.patch("cloudinit.subp.subp")
-def test_parse_mount(mock_subp, m_is_DragonFlyBSD):
- mount_out = """
-vbd0s3 on / (hammer2, local)
-devfs on /dev (devfs, nosymfollow, local)
-/dev/vbd0s0a on /boot (ufs, local)
-procfs on /proc (procfs, local)
-tmpfs on /var/run/shm (tmpfs, local)
-"""
-
- mock_subp.return_value = (mount_out, "")
- m_is_DragonFlyBSD.return_value = True
- assert cloudinit.util.parse_mount("/") == ("vbd0s3", "hammer2", "/")