diff options
author | Jon Grimm <jon.grimm@canonical.com> | 2016-11-22 17:09:53 -0600 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-12-22 17:04:28 -0500 |
commit | b2a9f33616c806ae6e052520a8589113308f567c (patch) | |
tree | e24d64e56104dfa1b608a9f255c9b8f618e45cc0 /tests/unittests/test_distros | |
parent | 0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff) | |
download | vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.tar.gz vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.zip |
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
This has been a recurring ask and we had initially just made the change to
the cloud-init 2.0 codebase. As the current thinking is we'll just
continue to enhance the current codebase, its desirable to relicense to
match what we'd intended as part of the 2.0 plan here.
- put a brief description of license in LICENSE file
- put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0
- simplify the per-file header to reference LICENSE
- tox: ignore H102 (Apache License Header check)
Add license header to files that ship.
Reformat headers, make sure everything has vi: at end of file.
Non-shipping files do not need the copyright header,
but at the moment tests/ have it.
Diffstat (limited to 'tests/unittests/test_distros')
-rw-r--r-- | tests/unittests/test_distros/test_create_users.py | 4 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_generic.py | 2 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_hostname.py | 4 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_hosts.py | 4 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 4 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_resolv.py | 4 | ||||
-rw-r--r-- | tests/unittests/test_distros/test_sysconfig.py | 4 | ||||
-rwxr-xr-x | tests/unittests/test_distros/test_user_data_normalize.py | 4 |
8 files changed, 30 insertions, 0 deletions
diff --git a/tests/unittests/test_distros/test_create_users.py b/tests/unittests/test_distros/test_create_users.py index 01a49f48..9ded4f6c 100644 --- a/tests/unittests/test_distros/test_create_users.py +++ b/tests/unittests/test_distros/test_create_users.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + from cloudinit import distros from ..helpers import (TestCase, mock) @@ -145,3 +147,5 @@ class TestCreateUser(TestCase): self._useradd2call([user, '--groups', 'group1,group2', '-m']), mock.call(['passwd', '-l', user])] self.assertEqual(m_subp.call_args_list, expected) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_generic.py b/tests/unittests/test_distros/test_generic.py index 24ad115f..c9be277e 100644 --- a/tests/unittests/test_distros/test_generic.py +++ b/tests/unittests/test_distros/test_generic.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + from cloudinit import distros from cloudinit import util diff --git a/tests/unittests/test_distros/test_hostname.py b/tests/unittests/test_distros/test_hostname.py index 5f28a868..f6d4dbe5 100644 --- a/tests/unittests/test_distros/test_hostname.py +++ b/tests/unittests/test_distros/test_hostname.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + import unittest from cloudinit.distros.parsers import hostname @@ -36,3 +38,5 @@ class TestHostnameHelper(unittest.TestCase): bbbbd ''' self.assertEqual(str(hn).strip(), expected_out.strip()) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_hosts.py b/tests/unittests/test_distros/test_hosts.py index ab867c6f..8aaa6e48 100644 --- a/tests/unittests/test_distros/test_hosts.py +++ b/tests/unittests/test_distros/test_hosts.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + import unittest from cloudinit.distros.parsers import hosts @@ -39,3 +41,5 @@ class TestHostsHelper(unittest.TestCase): eh.del_entries('127.0.0.0') self.assertEqual(eh.get_entry('127.0.0.0'), []) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index 36eae2dc..bde3bb50 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + import os from six import StringIO @@ -379,3 +381,5 @@ ifconfig_vtnet0="DHCP" ''' self.assertCfgEquals(expected_buf, str(write_buf)) self.assertEqual(write_buf.mode, 0o644) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_resolv.py b/tests/unittests/test_distros/test_resolv.py index 9402b5ea..6b535a95 100644 --- a/tests/unittests/test_distros/test_resolv.py +++ b/tests/unittests/test_distros/test_resolv.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + from cloudinit.distros.parsers import resolv_conf from cloudinit.distros import rhel_util @@ -65,3 +67,5 @@ class TestResolvHelper(TestCase): self.assertEqual(len(rp.search_domains), 6) self.assertRaises(ValueError, rp.add_search_domain, 'bbb5.y.com') self.assertEqual(len(rp.search_domains), 6) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_sysconfig.py b/tests/unittests/test_distros/test_sysconfig.py index 8cb55522..235ecebb 100644 --- a/tests/unittests/test_distros/test_sysconfig.py +++ b/tests/unittests/test_distros/test_sysconfig.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + import re from cloudinit.distros.parsers.sys_conf import SysConf @@ -80,3 +82,5 @@ USEMD5=no''' contents = str(conf) self.assertIn("Z=d", contents) self.assertIn("BLAH=b", contents) + +# vi: ts=4 expandtab diff --git a/tests/unittests/test_distros/test_user_data_normalize.py b/tests/unittests/test_distros/test_user_data_normalize.py index 33bf922d..88746e0a 100755 --- a/tests/unittests/test_distros/test_user_data_normalize.py +++ b/tests/unittests/test_distros/test_user_data_normalize.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + from cloudinit import distros from cloudinit.distros import ug_util from cloudinit import helpers @@ -361,3 +363,5 @@ class TestUGNormalize(TestCase): mock_subp.assert_any_call(groupcmd) mock_subp.assert_any_call(addcmd, logstring=addcmd) + +# vi: ts=4 expandtab |