Changeset f53d684 in sasview for test/corfunc

Timestamp:

Dec 5, 2017 12:31:07 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5bb05a4

Parents:

3053a4a

git-author:

Stuart Prescott <llimeht@…> (12/05/17 12:31:07)

git-committer:

Paul Kienzle <pkienzle@…> (12/05/17 12:31:07)

Message:

Make tests work from any directory and functional without special runner script (#124)

File:

• test/corfunc/test/utest_corfunc.py (modified) (4 diffs)

test/corfunc/test/utest_corfunc.py

@@ -4 +4 @@
 from __future__ import division, print_function
 
+import os.path
 import unittest
 import time
@@ -11 +12 @@
 from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
 from sas.sascalc.dataloader.data_info import Data1D
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -31 +36 @@
         self.extrapolation = None
         self.transformation = None
-        self.results = [np.loadtxt(filename+"_out.txt").T[2]
+        self.results = [np.loadtxt(find(filename+"_out.txt")).T[2]
                         for filename in ("gamma1", "gamma3", "idf")]
 
@@ -110 +115 @@
 
 def load_data(filename="98929.txt"):
-    data = np.loadtxt(filename, dtype=np.float64)
+    data = np.loadtxt(find(filename), dtype=np.float64)
     q = data[:,0]
     iq = data[:,1]