Convert stderr and stdout in status to strings on assignment (#3049)
This avoids Python2 vs Python3 issues related to how we decode bytes
later on in the tests.
Switching over to using unittest instead of nosetest
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19108f3..ec87832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,6 @@
set(SPIRV_TOOLS "SPIRV-Tools")
include(GNUInstallDirs)
-include(cmake/setup_build.cmake)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_STANDARD 11)
diff --git a/cmake/setup_build.cmake b/cmake/setup_build.cmake
deleted file mode 100644
index 6ba4c53..0000000
--- a/cmake/setup_build.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# Find nosetests; see spirv_add_nosetests() for opting in to nosetests in a
-# specific directory.
-find_program(NOSETESTS_EXE NAMES nosetests PATHS $ENV{PYTHON_PACKAGE_PATH})
-if (NOT NOSETESTS_EXE)
- message(STATUS "SPIRV-Tools: nosetests was not found - python support code will not be tested")
-else()
- message(STATUS "SPIRV-Tools: nosetests found - python support code will be tested")
-endif()
-
-# Run nosetests on file ${PREFIX}_nosetest.py. Nosetests will look for classes
-# and functions whose names start with "nosetest". The test name will be
-# ${PREFIX}_nosetests.
-function(spirv_add_nosetests PREFIX)
- if(NOT "${SPIRV_SKIP_TESTS}" AND NOSETESTS_EXE)
- add_test(
- NAME ${PREFIX}_nosetests
- COMMAND ${NOSETESTS_EXE} -m "^[Nn]ose[Tt]est" -v
- ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}_nosetest.py)
- endif()
-endfunction()
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index cee95ca..99f9780 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -12,7 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-spirv_add_nosetests(expect)
-spirv_add_nosetests(spirv_test_framework)
-
+add_test(NAME spirv-tools_expect_unittests
+ COMMAND ${PYTHON_EXECUTABLE} -m unittest expect_unittest.py
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+add_test(NAME spirv-tools_spirv_test_framework_unittests
+ COMMAND ${PYTHON_EXECUTABLE} -m unittest spirv_test_framework_unittest.py
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(opt)
diff --git a/test/tools/expect.py b/test/tools/expect.py
index 52999ce..0b51adc 100755
--- a/test/tools/expect.py
+++ b/test/tools/expect.py
@@ -510,7 +510,7 @@
if not status.stderr:
return False, 'Expected error message, but no output on stderr'
if self.expected_error_substr not in convert_to_unix_line_endings(
- status.stderr.decode('utf8')):
+ status.stderr):
return False, ('Incorrect stderr output:\n{act}\n'
'Expected substring not found in stderr:\n{exp}'.format(
act=status.stderr, exp=self.expected_error_substr))
@@ -530,7 +530,7 @@
' command execution')
if not status.stderr:
return False, 'Expected warning message, but no output on stderr'
- if self.expected_warning != convert_to_unix_line_endings(status.stderr.decode('utf8')):
+ if self.expected_warning != convert_to_unix_line_endings(status.stderr):
return False, ('Incorrect stderr output:\n{act}\n'
'Expected:\n{exp}'.format(
act=status.stderr, exp=self.expected_warning))
@@ -590,16 +590,16 @@
if not status.stdout:
return False, 'Expected something on stdout'
elif type(self.expected_stdout) == str:
- if self.expected_stdout != convert_to_unix_line_endings(status.stdout.decode('utf8')):
+ if self.expected_stdout != convert_to_unix_line_endings(status.stdout):
return False, ('Incorrect stdout output:\n{ac}\n'
'Expected:\n{ex}'.format(
ac=status.stdout, ex=self.expected_stdout))
else:
- converted = convert_to_unix_line_endings(status.stdout.decode('utf8'))
+ converted = convert_to_unix_line_endings(status.stdout)
if not self.expected_stdout.search(converted):
return False, ('Incorrect stdout output:\n{ac}\n'
'Expected to match regex:\n{ex}'.format(
- ac=status.stdout.decode('utf8'), ex=self.expected_stdout.pattern))
+ ac=status.stdout, ex=self.expected_stdout.pattern))
return True, ''
@@ -624,13 +624,13 @@
if not status.stderr:
return False, 'Expected something on stderr'
elif type(self.expected_stderr) == str:
- if self.expected_stderr != convert_to_unix_line_endings(status.stderr.decode('utf8')):
+ if self.expected_stderr != convert_to_unix_line_endings(status.stderr):
return False, ('Incorrect stderr output:\n{ac}\n'
'Expected:\n{ex}'.format(
ac=status.stderr, ex=self.expected_stderr))
else:
if not self.expected_stderr.search(
- convert_to_unix_line_endings(status.stderr.decode('utf8'))):
+ convert_to_unix_line_endings(status.stderr)):
return False, ('Incorrect stderr output:\n{ac}\n'
'Expected to match regex:\n{ex}'.format(
ac=status.stderr, ex=self.expected_stderr.pattern))
@@ -695,7 +695,7 @@
# Collect all the output lines containing a pass name.
pass_names = []
pass_name_re = re.compile(r'.*IR before pass (?P<pass_name>[\S]+)')
- for line in status.stderr.decode('utf8').splitlines():
+ for line in status.stderr.splitlines():
match = pass_name_re.match(line)
if match:
pass_names.append(match.group('pass_name'))
diff --git a/test/tools/expect_nosetest.py b/test/tools/expect_nosetest.py
deleted file mode 100755
index b591a2d..0000000
--- a/test/tools/expect_nosetest.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2018 Google LLC
-#
-# 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.
-"""Tests for the expect module."""
-
-import expect
-from spirv_test_framework import TestStatus
-from nose.tools import assert_equal, assert_true, assert_false
-import re
-
-
-def nosetest_get_object_name():
- """Tests get_object_filename()."""
- source_and_object_names = [('a.vert', 'a.vert.spv'), ('b.frag', 'b.frag.spv'),
- ('c.tesc', 'c.tesc.spv'), ('d.tese', 'd.tese.spv'),
- ('e.geom', 'e.geom.spv'), ('f.comp', 'f.comp.spv'),
- ('file', 'file.spv'), ('file.', 'file.spv'),
- ('file.uk',
- 'file.spv'), ('file.vert.',
- 'file.vert.spv'), ('file.vert.bla',
- 'file.vert.spv')]
- actual_object_names = [
- expect.get_object_filename(f[0]) for f in source_and_object_names
- ]
- expected_object_names = [f[1] for f in source_and_object_names]
-
- assert_equal(actual_object_names, expected_object_names)
-
-
-class TestStdoutMatchADotC(expect.StdoutMatch):
- expected_stdout = re.compile('a.c')
-
-
-def nosetest_stdout_match_regex_has_match():
- test = TestStdoutMatchADotC()
- status = TestStatus(
- test_manager=None,
- returncode=0,
- stdout='0abc1',
- stderr=None,
- directory=None,
- inputs=None,
- input_filenames=None)
- assert_true(test.check_stdout_match(status)[0])
-
-
-def nosetest_stdout_match_regex_no_match():
- test = TestStdoutMatchADotC()
- status = TestStatus(
- test_manager=None,
- returncode=0,
- stdout='ab',
- stderr=None,
- directory=None,
- inputs=None,
- input_filenames=None)
- assert_false(test.check_stdout_match(status)[0])
-
-
-def nosetest_stdout_match_regex_empty_stdout():
- test = TestStdoutMatchADotC()
- status = TestStatus(
- test_manager=None,
- returncode=0,
- stdout='',
- stderr=None,
- directory=None,
- inputs=None,
- input_filenames=None)
- assert_false(test.check_stdout_match(status)[0])
diff --git a/test/tools/expect_unittest.py b/test/tools/expect_unittest.py
new file mode 100644
index 0000000..a28de1b
--- /dev/null
+++ b/test/tools/expect_unittest.py
@@ -0,0 +1,82 @@
+# Copyright (c) 2019 Google LLC
+#
+# 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.
+"""Tests for the expect module."""
+
+import expect
+from spirv_test_framework import TestStatus
+import re
+import unittest
+
+
+class TestStdoutMatchADotC(expect.StdoutMatch):
+ expected_stdout = re.compile('a.c')
+
+
+class TestExpect(unittest.TestCase):
+ def test_get_object_name(self):
+ """Tests get_object_filename()."""
+ source_and_object_names = [('a.vert', 'a.vert.spv'),
+ ('b.frag', 'b.frag.spv'),
+ ('c.tesc', 'c.tesc.spv'),
+ ('d.tese', 'd.tese.spv'),
+ ('e.geom', 'e.geom.spv'),
+ ('f.comp', 'f.comp.spv'),
+ ('file', 'file.spv'), ('file.', 'file.spv'),
+ ('file.uk',
+ 'file.spv'), ('file.vert.',
+ 'file.vert.spv'),
+ ('file.vert.bla',
+ 'file.vert.spv')]
+ actual_object_names = [
+ expect.get_object_filename(f[0]) for f in source_and_object_names
+ ]
+ expected_object_names = [f[1] for f in source_and_object_names]
+
+ self.assertEqual(actual_object_names, expected_object_names)
+
+ def test_stdout_match_regex_has_match(self):
+ test = TestStdoutMatchADotC()
+ status = TestStatus(
+ test_manager=None,
+ returncode=0,
+ stdout=b'0abc1',
+ stderr=None,
+ directory=None,
+ inputs=None,
+ input_filenames=None)
+ self.assertTrue(test.check_stdout_match(status)[0])
+
+ def test_stdout_match_regex_no_match(self):
+ test = TestStdoutMatchADotC()
+ status = TestStatus(
+ test_manager=None,
+ returncode=0,
+ stdout=b'ab',
+ stderr=None,
+ directory=None,
+ inputs=None,
+ input_filenames=None)
+ self.assertFalse(test.check_stdout_match(status)[0])
+
+ def test_stdout_match_regex_empty_stdout(self):
+ test = TestStdoutMatchADotC()
+ status = TestStatus(
+ test_manager=None,
+ returncode=0,
+ stdout=b'',
+ stderr=None,
+ directory=None,
+ inputs=None,
+ input_filenames=None)
+ self.assertFalse(test.check_stdout_match(status)[0])
diff --git a/test/tools/spirv_test_framework.py b/test/tools/spirv_test_framework.py
index d8d64f3..42f83c6 100755
--- a/test/tools/spirv_test_framework.py
+++ b/test/tools/spirv_test_framework.py
@@ -70,7 +70,7 @@
def get_all_superclasses(cls):
- """Returns all superclasses of a given class.
+ """Returns all superclasses of a given class. Omits root 'object' superclass.
Returns:
A list of superclasses of the given class. The order guarantees that
@@ -83,11 +83,12 @@
classes = []
for superclass in cls.__bases__:
for c in get_all_superclasses(superclass):
- if c not in classes:
+ if c is not object and c not in classes:
classes.append(c)
for superclass in cls.__bases__:
- if superclass not in classes:
+ if superclass is not object and superclass not in classes:
classes.append(superclass)
+
return classes
@@ -142,8 +143,28 @@
inputs, input_filenames):
self.test_manager = test_manager
self.returncode = returncode
- self.stdout = stdout
- self.stderr = stderr
+ # Some of our MacOS bots still run Python 2, so need to be backwards
+ # compatible here.
+ if type(stdout) is not str:
+ if sys.version_info[0] is 2:
+ self.stdout = stdout.decode('utf-8')
+ elif sys.version_info[0] is 3:
+ self.stdout = str(stdout, encoding='utf-8') if stdout is not None else stdout
+ else:
+ raise Exception('Unable to determine if running Python 2 or 3 from {}'.format(sys.version_info))
+ else:
+ self.stdout = stdout
+
+ if type(stderr) is not str:
+ if sys.version_info[0] is 2:
+ self.stderr = stderr.decode('utf-8')
+ elif sys.version_info[0] is 3:
+ self.stderr = str(stderr, encoding='utf-8') if stderr is not None else stderr
+ else:
+ raise Exception('Unable to determine if running Python 2 or 3 from {}'.format(sys.version_info))
+ else:
+ self.stderr = stderr
+
# temporary directory where the test runs
self.directory = directory
# List of inputs, as PlaceHolder objects.
diff --git a/test/tools/spirv_test_framework_nosetest.py b/test/tools/spirv_test_framework_nosetest.py
deleted file mode 100755
index c0fbed5..0000000
--- a/test/tools/spirv_test_framework_nosetest.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright (c) 2018 Google LLC
-#
-# 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 spirv_test_framework import get_all_test_methods, get_all_superclasses
-from nose.tools import assert_equal, with_setup
-
-
-# Classes to be used in testing get_all_{superclasses|test_methods}()
-class Root:
-
- def check_root(self):
- pass
-
-
-class A(Root):
-
- def check_a(self):
- pass
-
-
-class B(Root):
-
- def check_b(self):
- pass
-
-
-class C(Root):
-
- def check_c(self):
- pass
-
-
-class D(Root):
-
- def check_d(self):
- pass
-
-
-class E(Root):
-
- def check_e(self):
- pass
-
-
-class H(B, C, D):
-
- def check_h(self):
- pass
-
-
-class I(E):
-
- def check_i(self):
- pass
-
-
-class O(H, I):
-
- def check_o(self):
- pass
-
-
-class U(A, O):
-
- def check_u(self):
- pass
-
-
-class X(U, A):
-
- def check_x(self):
- pass
-
-
-class R1:
-
- def check_r1(self):
- pass
-
-
-class R2:
-
- def check_r2(self):
- pass
-
-
-class Multi(R1, R2):
-
- def check_multi(self):
- pass
-
-
-def nosetest_get_all_superclasses():
- """Tests get_all_superclasses()."""
-
- assert_equal(get_all_superclasses(A), [Root])
- assert_equal(get_all_superclasses(B), [Root])
- assert_equal(get_all_superclasses(C), [Root])
- assert_equal(get_all_superclasses(D), [Root])
- assert_equal(get_all_superclasses(E), [Root])
-
- assert_equal(get_all_superclasses(H), [Root, B, C, D])
- assert_equal(get_all_superclasses(I), [Root, E])
-
- assert_equal(get_all_superclasses(O), [Root, B, C, D, E, H, I])
-
- assert_equal(get_all_superclasses(U), [Root, B, C, D, E, H, I, A, O])
- assert_equal(get_all_superclasses(X), [Root, B, C, D, E, H, I, A, O, U])
-
- assert_equal(get_all_superclasses(Multi), [R1, R2])
-
-
-def nosetest_get_all_methods():
- """Tests get_all_test_methods()."""
- assert_equal(get_all_test_methods(A), ['check_root', 'check_a'])
- assert_equal(get_all_test_methods(B), ['check_root', 'check_b'])
- assert_equal(get_all_test_methods(C), ['check_root', 'check_c'])
- assert_equal(get_all_test_methods(D), ['check_root', 'check_d'])
- assert_equal(get_all_test_methods(E), ['check_root', 'check_e'])
-
- assert_equal(
- get_all_test_methods(H),
- ['check_root', 'check_b', 'check_c', 'check_d', 'check_h'])
- assert_equal(get_all_test_methods(I), ['check_root', 'check_e', 'check_i'])
-
- assert_equal(
- get_all_test_methods(O), [
- 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
- 'check_i', 'check_o'
- ])
-
- assert_equal(
- get_all_test_methods(U), [
- 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
- 'check_i', 'check_a', 'check_o', 'check_u'
- ])
- assert_equal(
- get_all_test_methods(X), [
- 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
- 'check_i', 'check_a', 'check_o', 'check_u', 'check_x'
- ])
-
- assert_equal(
- get_all_test_methods(Multi), ['check_r1', 'check_r2', 'check_multi'])
diff --git a/test/tools/spirv_test_framework_unittest.py b/test/tools/spirv_test_framework_unittest.py
new file mode 100644
index 0000000..e64e86c
--- /dev/null
+++ b/test/tools/spirv_test_framework_unittest.py
@@ -0,0 +1,158 @@
+# Copyright (c) 2019 Google LLC
+#
+# 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.
+"""Tests for the spirv test framework module."""
+
+from spirv_test_framework import get_all_test_methods, get_all_superclasses
+import unittest
+
+# Classes to be used in testing get_all_{superclasses|test_methods}()
+
+
+class Root:
+
+ def check_root(self):
+ pass
+
+
+class A(Root):
+
+ def check_a(self):
+ pass
+
+
+class B(Root):
+
+ def check_b(self):
+ pass
+
+
+class C(Root):
+
+ def check_c(self):
+ pass
+
+
+class D(Root):
+
+ def check_d(self):
+ pass
+
+
+class E(Root):
+
+ def check_e(self):
+ pass
+
+
+class H(B, C, D):
+
+ def check_h(self):
+ pass
+
+
+class I(E):
+
+ def check_i(self):
+ pass
+
+
+class O(H, I):
+
+ def check_o(self):
+ pass
+
+
+class U(A, O):
+
+ def check_u(self):
+ pass
+
+
+class X(U, A):
+
+ def check_x(self):
+ pass
+
+
+class R1:
+
+ def check_r1(self):
+ pass
+
+
+class R2:
+
+ def check_r2(self):
+ pass
+
+
+class Multi(R1, R2):
+
+ def check_multi(self):
+ pass
+
+
+class TestSpirvTestFramework(unittest.TestCase):
+ def test_get_all_superclasses(self):
+ self.assertEqual(get_all_superclasses(A), [Root])
+ self.assertEqual(get_all_superclasses(B), [Root])
+ self.assertEqual(get_all_superclasses(C), [Root])
+ self.assertEqual(get_all_superclasses(D), [Root])
+ self.assertEqual(get_all_superclasses(E), [Root])
+
+ self.assertEqual(get_all_superclasses(H), [Root, B, C, D])
+ self.assertEqual(get_all_superclasses(I), [Root, E])
+
+ self.assertEqual(get_all_superclasses(O), [Root, B, C, D, E, H, I])
+
+ self.assertEqual(get_all_superclasses(
+ U), [Root, B, C, D, E, H, I, A, O])
+ self.assertEqual(get_all_superclasses(
+ X), [Root, B, C, D, E, H, I, A, O, U])
+
+ self.assertEqual(get_all_superclasses(Multi), [R1, R2])
+
+ def test_get_all_methods(self):
+ self.assertEqual(get_all_test_methods(A), ['check_root', 'check_a'])
+ self.assertEqual(get_all_test_methods(B), ['check_root', 'check_b'])
+ self.assertEqual(get_all_test_methods(C), ['check_root', 'check_c'])
+ self.assertEqual(get_all_test_methods(D), ['check_root', 'check_d'])
+ self.assertEqual(get_all_test_methods(E), ['check_root', 'check_e'])
+
+ self.assertEqual(
+ get_all_test_methods(H),
+ ['check_root', 'check_b', 'check_c', 'check_d', 'check_h'])
+ self.assertEqual(get_all_test_methods(
+ I), ['check_root', 'check_e', 'check_i'])
+
+ self.assertEqual(
+ get_all_test_methods(O), [
+ 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
+ 'check_i', 'check_o'
+ ])
+
+ self.assertEqual(
+ get_all_test_methods(U), [
+ 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
+ 'check_i', 'check_a', 'check_o', 'check_u'
+ ])
+
+ self.assertEqual(
+ get_all_test_methods(X), [
+ 'check_root', 'check_b', 'check_c', 'check_d', 'check_e', 'check_h',
+ 'check_i', 'check_a', 'check_o', 'check_u', 'check_x'
+ ])
+
+ self.assertEqual(
+ get_all_test_methods(Multi), ['check_r1', 'check_r2', 'check_multi'])
