From dbcc12fee349254360f82213e06e0b72a3d4c089 Mon Sep 17 00:00:00 2001
From: Ansgar Philippsen <ansgar.philippsen@gmail.com>
Date: Fri, 17 Jun 2011 13:47:39 -0400
Subject: [PATCH] fixed mol/numpy unit test to use project convention
---
modules/mol/base/tests/CMakeLists.txt | 1 +
modules/mol/base/tests/test_numpy.py | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/mol/base/tests/CMakeLists.txt b/modules/mol/base/tests/CMakeLists.txt
index b9771e0c3..39593e60f 100644
--- a/modules/mol/base/tests/CMakeLists.txt
+++ b/modules/mol/base/tests/CMakeLists.txt
@@ -13,6 +13,7 @@ set(OST_MOL_BASE_UNIT_TESTS
test_view.cc
test_view_op.cc
tests.cc
+ test_numpy.py
)
ost_unittest(MODULE mol SOURCES "${OST_MOL_BASE_UNIT_TESTS}")
diff --git a/modules/mol/base/tests/test_numpy.py b/modules/mol/base/tests/test_numpy.py
index 1255425f8..14496c0c0 100644
--- a/modules/mol/base/tests/test_numpy.py
+++ b/modules/mol/base/tests/test_numpy.py
@@ -1,8 +1,11 @@
-import sys,unittest
-sys.path.append("../../../../stage/lib/openstructure")
-sys.path.append("../../../../stage/lib64/openstructure")
+import unittest
from ost import *
-import numpy
+
+has_numpy=True
+try:
+ import numpy
+except ImportError:
+ has_numpy=False
def v2v(v):
return geom.Vec3(float(v[0]),float(v[1]),float(v[2]))
@@ -15,6 +18,8 @@ class TestNumpy(unittest.TestCase):
pass
def test_(self):
+ if not has_numpy:
+ return
entity=mol.CreateEntity()
ed=entity.EditXCS()
ch=ed.InsertChain("X")
--
GitLab