diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /tests/python | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests/python')
| -rwxr-xr-x | tests/python/modules/render_report.py | 1 | ||||
| -rwxr-xr-x | tests/python/modules/test_utils.py | 1 | ||||
| -rw-r--r-- | tests/python/rna_array.py | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 2e7a092b3d8..425e6d59fa0 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -444,4 +444,3 @@ class Report: print_message("{}" . format(test), 'FAILURE', "FAILED") return not bool(failed_tests) - diff --git a/tests/python/modules/test_utils.py b/tests/python/modules/test_utils.py index c4496c3e3ac..2b762b4122c 100755 --- a/tests/python/modules/test_utils.py +++ b/tests/python/modules/test_utils.py @@ -102,4 +102,3 @@ class AbstractBlenderRunnerTest(unittest.TestCase): self.fail('Error %d running Blender:\n%s' % (proc.returncode, output)) return output - diff --git a/tests/python/rna_array.py b/tests/python/rna_array.py index dda13d2c3ae..0f6c0ce0a57 100644 --- a/tests/python/rna_array.py +++ b/tests/python/rna_array.py @@ -278,4 +278,3 @@ def suite(): if __name__ == "__main__": unittest.TextTestRunner(verbosity=2).run(suite()) - |