Fix oslo_config list_opts

cotyledon/oslo_config_glue.py

@@ -39,6 +39,6 @@ def load_options(service, conf):
         conf.log_opt_values(LOG, logging.DEBUG)
 
 
-def list_opts(self):
+def list_opts():
     """Entry point for oslo-config-generator."""
     return [(None, copy.deepcopy(service_opts))]

cotyledon/tests/examples.py

@@ -65,7 +65,6 @@ class OsloService(cotyledon.Service):
         conf([], project='gnocchi', validate_default_values=True,
              version="0.1")
         oslo_config_glue.load_options(self, conf)
-        oslo_config_glue.list_opts()
 
 
 def example_app():

cotyledon/tests/test_cotyledon.py

@@ -20,6 +20,7 @@ import sys
 import time
 import unittest
 
+from cotyledon import oslo_config_glue
 from cotyledon.tests import base
 
 
@@ -227,6 +228,11 @@ class TestOsloCotyledon(Base):
     name = "oslo_app"
 
     def test_options(self):
+        options = oslo_config_glue.list_opts()
+        self.assertEqual(1, len(options))
+        self.assertEqual(None, options[0][0])
+        self.assertEqual(2, len(options[0][1]))
+
         lines = self.get_lines(1)
         self.assertEqual(
             b'DEBUG:cotyledon.oslo_config_glue:Full set of CONF:',