aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStefan Landvogt <stefan@valvesoftware.com>2013-06-28 11:55:25 -0700
committerJohn Ehresman <jpe@wingware.com>2013-06-28 21:13:47 +0200
commit297f2708dfd049b8b475ee1e680a788f0dfe164b (patch)
tree02a51993c23e13954db109bddc8fd3625c2f5f6e /tests
parent42f40dc10b715cd91d8d020a4708154a5d7f6a6d (diff)
Fixing shiboken test for minimal binding test
Don't execute typedef_test.py, when NumPy is not installed Change-Id: I452944822177f616ea640ed0ee005d0436ab518b Reviewed-by: John Ehresman <jpe@wingware.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/minimalbinding/typedef_test.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/minimalbinding/typedef_test.py b/tests/minimalbinding/typedef_test.py
index ca90372aa..089b2796f 100644
--- a/tests/minimalbinding/typedef_test.py
+++ b/tests/minimalbinding/typedef_test.py
@@ -27,7 +27,12 @@
import unittest
from minimal import *
from py3kcompat import IS_PY3K
-import numpy as np
+
+try:
+ import numpy as np
+except ImportError, e:
+ np = None
+
if IS_PY3K:
import functools
@@ -101,4 +106,5 @@ class TypedefTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
+ if np != None:
+ unittest.main()