summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2015-07-06 16:28:06 -0700
committerDylan Baker <baker.dylan.c@gmail.com>2015-07-07 14:44:18 -0700
commit69cc814b7930d2369801ba4d14ad3c241ab9ddfd (patch)
tree1c44a13ddde3f7b59d126b446044a72a2e0847d3 /framework
parent598a86a8a6c967140bdc5a6eb80243226f916d5f (diff)
framework: replace uses of SafeConfigParser with PiglitConfig
In both cases these should have been changed to PiglitConfig instead, which is mostly the same except for a couple of convenience methods. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
Diffstat (limited to 'framework')
-rw-r--r--framework/tests/core_tests.py4
-rw-r--r--framework/tests/run_parser_tests.py3
2 files changed, 2 insertions, 5 deletions
diff --git a/framework/tests/core_tests.py b/framework/tests/core_tests.py
index 9a49515fb..4d0a9aa79 100644
--- a/framework/tests/core_tests.py
+++ b/framework/tests/core_tests.py
@@ -26,7 +26,6 @@ import collections
import shutil
import textwrap
import functools
-import ConfigParser
import nose.tools as nt
@@ -66,8 +65,7 @@ def _save_core_config(func):
if os.path.exists('piglit.conf'):
shutil.move('piglit.conf', 'piglit.conf.restore')
restore_piglitconf = True
- core.PIGLIT_CONFIG = ConfigParser.SafeConfigParser(
- allow_no_value=True)
+ core.PIGLIT_CONFIG = core.PiglitConfig(allow_no_value=True)
except Exception as e:
raise utils.UtilsError(e)
diff --git a/framework/tests/run_parser_tests.py b/framework/tests/run_parser_tests.py
index cddaa5837..5f0b21b65 100644
--- a/framework/tests/run_parser_tests.py
+++ b/framework/tests/run_parser_tests.py
@@ -24,7 +24,6 @@ from __future__ import print_function, absolute_import
import sys
import os
import shutil
-import ConfigParser
import nose.tools as nt
@@ -108,7 +107,7 @@ class _Helpers(TestWithEnvClean):
def setup(self):
# Set core.PIGLIT_CONFIG back to pristine between tests
- core.PIGLIT_CONFIG = ConfigParser.SafeConfigParser()
+ core.PIGLIT_CONFIG = core.PiglitConfig(allow_no_value=True)
class TestBackend(_Helpers):