Changeset de43192 in sasview

Timestamp:

May 5, 2018 6:39:09 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

9258c43c

Parents:

7d5e7da (diff), 6ef75fa6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (05/05/18 18:39:09)

git-committer:

GitHub <noreply@…> (05/05/18 18:39:09)

Message:

Merge pull request #153 from llimeht/tmp/fix-test-race

Fix race condition in test

File:

• test/corfunc/test/utest_corfunc.py (modified) (1 diff)

test/corfunc/test/utest_corfunc.py

@@ -74 +74 @@
         while True:
             time.sleep(0.001)
-            if not self.calculator.transform_isrunning():
+            if (not self.calculator.transform_isrunning() and
+                self.transformation is not None):
                 break
 
-    def transform_callback(self, transforms):
-        transform1, transform3, idf = transforms
+        transform1, transform3, idf = self.transformation
         self.assertIsNotNone(transform1)
         self.assertAlmostEqual(transform1.y[0], 1)
         self.assertAlmostEqual(transform1.y[-1], 0, 5)
+
+    def transform_callback(self, transforms):
         self.transformation = transforms