Added is_excluded tests and updated gentoo init script

3 files changed, 15 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index b0766970..9118e5f6 100755
--- a/setup.py
+++ b/setup.py
@@ -39,14 +39,12 @@ def is_f(p):
 INITSYS_FILES = {
     'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
     'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
-    'sysvinit_gentoo': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
     'systemd': [f for f in glob('systemd/*') if is_f(f)],
     'upstart': [f for f in glob('upstart/*') if is_f(f)],
 }
 INITSYS_ROOTS = {
     'sysvinit': '/etc/rc.d/init.d',
     'sysvinit_deb': '/etc/init.d',
-    'sysvinit_gentoo': '/etc/init.d',
     'systemd': '/etc/systemd/system/',
     'upstart': '/etc/init/',
 }
diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
index 1d22a79d..8c9968d8 100644
--- a/sysvinit/gentoo/cloud-init-local
+++ b/sysvinit/gentoo/cloud-init-local
@@ -1,7 +1,6 @@
 #!/sbin/runscript
 
 depend() {
-  after net # remove after nova-agent fix
   before cloud-init
   provide cloud-init-local
 }
diff --git a/tests/unittests/test_distros/test_is_excluded.py b/tests/unittests/test_distros/test_is_excluded.py
new file mode 100644
index 00000000..53a4445c
--- /dev/null
+++ b/tests/unittests/test_distros/test_is_excluded.py
@@ -0,0 +1,15 @@
+from cloudinit.distros import gentoo
+import unittest
+
+
+class TestIsExcluded(unittest.TestCase):
+
+    def setUp(self):
+        self.distro = gentoo.Distro('gentoo', {}, None)
+        self.distro.exclude_modules = ['test-module']
+
+    def test_is_excluded_success(self):
+        self.assertEqual(self.distro.is_excluded('test-module'), True)
+
+    def test_is_excluded_fail(self):
+        self.assertEqual(self.distro.is_excluded('missing'), None)