Remove usage of enforce_type=True

We deprecated and changed enforce_type's default value in [1],
need clean usage of enforce_type=True in oslo.config firstly.

This commit also makes enforce_type=True in fixture.

[1] https://review.openstack.org/#/c/328692/

Change-Id: I5b62427495179edb7672c6e5c508037f8b9d0b84

oslo_config/fixture.py

@@ -68,7 +68,7 @@ def config(self, **kw):
         """
 
         group = kw.pop('group', None)
-        enforce_type = kw.pop('enforce_type', False)
+        enforce_type = kw.pop('enforce_type', True)
         for k, v in kw.items():
             self.conf.set_override(k, v, group, enforce_type=enforce_type)
 

oslo_config/tests/test_cfg.py

@@ -3122,14 +3122,13 @@ def test_set_default_not_in_choices(self):
         self.conf.register_cli_opt(cfg.StrOpt('oo', choices=('a', 'b')),
                                    group='f')
         self.assertRaises(ValueError,
-                          self.conf.set_default, 'oo', 'c', 'f',
-                          enforce_type=True)
+                          self.conf.set_default, 'oo', 'c', 'f')
 
     def test_enforce_type_default_override(self):
         self.conf.register_opt(cfg.StrOpt('foo', default='foo'))
         self.conf([])
         self.assertEqual('foo', self.conf.foo)
-        self.conf.set_default('foo', 'bar', enforce_type=True)
+        self.conf.set_default('foo', 'bar')
         self.assertEqual('bar', self.conf.foo)
         self.conf.clear_default('foo')
         self.assertEqual('foo', self.conf.foo)
@@ -3212,7 +3211,7 @@ def test_cli_bool_override(self):
 
     def test_enforce_type_str_override(self):
         self.conf.register_opt(cfg.StrOpt('foo'))
-        self.conf.set_override('foo', True, enforce_type=True)
+        self.conf.set_override('foo', True)
         self.conf([])
         self.assertEqual('True', self.conf.foo)
         self.conf.clear_override('foo')
@@ -3236,44 +3235,43 @@ def test_set_override_in_choices(self):
         self.conf.register_group(cfg.OptGroup('f'))
         self.conf.register_cli_opt(cfg.StrOpt('oo', choices=('a', 'b')),
                                    group='f')
-        self.conf.set_override('oo', 'b', 'f', enforce_type=True)
+        self.conf.set_override('oo', 'b', 'f')
         self.assertEqual('b', self.conf.f.oo)
 
     def test_set_override_not_in_choices(self):
         self.conf.register_group(cfg.OptGroup('f'))
         self.conf.register_cli_opt(cfg.StrOpt('oo', choices=('a', 'b')),
                                    group='f')
         self.assertRaises(ValueError,
-                          self.conf.set_override, 'oo', 'c', 'f',
-                          enforce_type=True)
+                          self.conf.set_override, 'oo', 'c', 'f')
 
     def test_enforce_type_bool_override(self):
         self.conf.register_opt(cfg.BoolOpt('foo'))
-        self.conf.set_override('foo', 'True', enforce_type=True)
+        self.conf.set_override('foo', 'True')
         self.conf([])
         self.assertTrue(self.conf.foo)
         self.conf.clear_override('foo')
         self.assertIsNone(self.conf.foo)
 
     def test_enforce_type_int_override_with_None(self):
         self.conf.register_opt(cfg.IntOpt('foo'))
-        self.conf.set_override('foo', None, enforce_type=True)
+        self.conf.set_override('foo', None)
         self.conf([])
         self.assertIsNone(self.conf.foo)
         self.conf.clear_override('foo')
         self.assertIsNone(self.conf.foo)
 
     def test_enforce_type_str_override_with_None(self):
         self.conf.register_opt(cfg.StrOpt('foo'))
-        self.conf.set_override('foo', None, enforce_type=True)
+        self.conf.set_override('foo', None)
         self.conf([])
         self.assertIsNone(self.conf.foo)
         self.conf.clear_override('foo')
         self.assertIsNone(self.conf.foo)
 
     def test_enforce_type_List_override(self):
         self.conf.register_opt(cfg.ListOpt('foo'))
-        self.conf.set_override('foo', ['aa', 'bb'], enforce_type=True)
+        self.conf.set_override('foo', ['aa', 'bb'])
         self.conf([])
         self.assertEqual(['aa', 'bb'], self.conf.foo)
         self.conf.clear_override('foo')

oslo_config/tests/test_fixture.py

@@ -47,13 +47,13 @@ def test_overridden_value_with_enforce_type(self):
         self.assertEqual(5, f.conf.get('test2'))
         self.assertEqual('a', f.conf.get('test3'))
         # with enforce_type=False
-        f.config(test2=-1)
+        f.config(test2=-1, enforce_type=False)
         self.assertEqual(-1, f.conf.get('test2'))
-        f.config(test3='c')
+        f.config(test3='c', enforce_type=False)
         self.assertEqual('c', f.conf.get('test3'))
         # with enforce_type=True
-        self.assertRaises(ValueError, f.config, test2=-1, enforce_type=True)
-        self.assertRaises(ValueError, f.config, test3='c', enforce_type=True)
+        self.assertRaises(ValueError, f.config, test2=-1)
+        self.assertRaises(ValueError, f.config, test3='c')
 
     def test_cleanup(self):
         f = self._make_fixture()