diff --git a/tests/testmods/__init__.py b/tests/testmods/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/testmods/baar_baa_opt.py b/tests/testmods/baar_baa_opt.py deleted file mode 100644 index 4011c92fa..000000000 --- a/tests/testmods/baar_baa_opt.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opt = cfg.StrOpt('baa') - -CONF.register_opt(opt, group='baar') diff --git a/tests/testmods/bar_foo_opt.py b/tests/testmods/bar_foo_opt.py deleted file mode 100644 index 1a1cfabca..000000000 --- a/tests/testmods/bar_foo_opt.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opt = cfg.StrOpt('foo') - -CONF.register_opt(opt, group='bar') diff --git a/tests/testmods/blaa_opt.py b/tests/testmods/blaa_opt.py deleted file mode 100644 index b40f0f865..000000000 --- a/tests/testmods/blaa_opt.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opts = [ - cfg.StrOpt('blaa', default="blaa"), - # duplicated option - cfg.StrOpt('blaa', default="blaa"), -] - -CONF.register_opts(opts) diff --git a/tests/testmods/fbaar_baa_opt.py b/tests/testmods/fbaar_baa_opt.py deleted file mode 100644 index 4e8e6acca..000000000 --- a/tests/testmods/fbaar_baa_opt.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opt = cfg.StrOpt('baa') - -CONF.register_opt(opt, group='fbaar') diff --git a/tests/testmods/fbar_foo_opt.py b/tests/testmods/fbar_foo_opt.py deleted file mode 100644 index 634959ef5..000000000 --- a/tests/testmods/fbar_foo_opt.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opt = cfg.StrOpt('foo') - -CONF.register_opt(opt, group='fbar') diff --git a/tests/testmods/fblaa_opt.py b/tests/testmods/fblaa_opt.py deleted file mode 100644 index ceaffbb0c..000000000 --- a/tests/testmods/fblaa_opt.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -opt = cfg.StrOpt('fblaa') - -CONF.register_opt(opt) diff --git a/tests/testmods/unicode_opt.py b/tests/testmods/unicode_opt.py deleted file mode 100644 index cd5bc10c4..000000000 --- a/tests/testmods/unicode_opt.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2014 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - -CONF = cfg.CONF - -# Use a unicode value that causes an exception if str() is used -opt = cfg.StrOpt('unicode_opt', default="unicode_default", - help=u'helpful message with unicode char: \xE7\x94\xB5') - -CONF.register_opt(opt, group='unicode_group')