summaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-03-26 15:22:12 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-05-01 14:28:17 -0700
commita3ddc62114168ce39a30965298ce95349889f67d (patch)
treefa3d21fd263ab09a4491ef1c32a41f7975f81e60 /unittests
parentfd84fca6514d8f42232f91ee063915f3eed44e22 (diff)
framework: do the same for shader test
Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
Diffstat (limited to 'unittests')
-rw-r--r--unittests/framework/test/test_shader_test.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/unittests/framework/test/test_shader_test.py b/unittests/framework/test/test_shader_test.py
index 163723129..c7a8da223 100644
--- a/unittests/framework/test/test_shader_test.py
+++ b/unittests/framework/test/test_shader_test.py
@@ -93,7 +93,7 @@ class TestConfigParsing(object):
[next section]
""".format(operator, gles)))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert os.path.basename(test.command[0]) == expected
@@ -105,7 +105,7 @@ class TestConfigParsing(object):
GL ES >= 3.0
GLSL ES >= 3.00 es
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert os.path.basename(test.command[0]) == "shader_runner_gles3"
@@ -117,7 +117,7 @@ class TestConfigParsing(object):
GL >= 3.0
GL_ARB_ham_sandwhich
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.gl_required == {'GL_ARB_ham_sandwhich'}
@@ -129,7 +129,7 @@ class TestConfigParsing(object):
GL >= 2.0
GL_ARB_ham_sandwhich
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.gl_version == 2.0
@@ -141,7 +141,7 @@ class TestConfigParsing(object):
GL ES >= 2.0
GL_ARB_ham_sandwhich
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.gles_version == 2.0
@@ -153,7 +153,7 @@ class TestConfigParsing(object):
GL >= 2.1
GLSL >= 1.20
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.glsl_version == 1.2
@@ -165,7 +165,7 @@ class TestConfigParsing(object):
GL ES >= 2.0
GLSL ES >= 1.00
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.glsl_es_version == 1.0
@@ -185,7 +185,7 @@ class TestConfigParsing(object):
GL_MAX_VARYING_COMPONENTS
GL_ARB_foobar
"""))
- test = shader_test.ShaderTest(six.text_type(p))
+ test = shader_test.ShaderTest.new(six.text_type(p))
assert test.gl_version == 3.3
assert test.glsl_version == 1.50
@@ -208,13 +208,13 @@ class TestCommand(object):
def test_getter_adds_auto_and_fbo(self, test_file):
"""test.shader_test.ShaderTest: -auto and -fbo is added to the command.
"""
- test = shader_test.ShaderTest(test_file)
+ test = shader_test.ShaderTest.new(test_file)
assert '-auto' in test.command
assert '-fbo' in test.command
def test_setter_doesnt_add_auto_and_fbo(self, test_file):
"""Don't add -fbo or -auto to self._command when using the setter."""
- test = shader_test.ShaderTest(test_file)
+ test = shader_test.ShaderTest.new(test_file)
test.command += ['-newarg']
assert '-auto' not in test._command
assert '-fbo' not in test._command