Changeset f53d684 in sasview for test/sasdataloader/test/utest_averaging.py

Timestamp:

Dec 5, 2017 12:31:07 PM (6 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/sasdataloader/test/utest_averaging.py (modified) (9 diffs)

test/sasdataloader/test/utest_averaging.py

@@ -13 +13 @@
                                                   SlabY, get_q,
                                                   reader2D_converter)
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -102 +106 @@
 
     def setUp(self):
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'MAR07232_rest.h5')
+        filepath = find('MAR07232_rest.h5')
         self.data_list = Loader().load(filepath)
         self.data = self.data_list[0]
@@ -118 +121 @@
 
         o = r(self.data)
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'ring_testdata.txt')
+        filepath = find('ring_testdata.txt')
         answer_list = Loader().load(filepath)
         answer = answer_list[0]
@@ -140 +142 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'avg_testdata.txt')
+        filepath = find('avg_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(r.nbins_phi):
@@ -176 +177 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'slabx_testdata.txt')
+        filepath = find('slabx_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -195 +195 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'slaby_testdata.txt')
+        filepath = find('slaby_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -222 +221 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'ring_testdata.txt')
+        filepath = find('ring_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -240 +238 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'sectorphi_testdata.txt')
+        filepath = find('sectorphi_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -258 +255 @@
         o = r(self.data)
 
-        filepath = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), 'sectorq_testdata.txt')
+        filepath = find('sectorq_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):