Changeset 6ef75fa6 in sasview for test/corfunc

Timestamp:

May 4, 2018 11:23:09 PM (7 years ago)

Author:

Stuart Prescott <stuart@…>

Branches:

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

Children:

0863065

Parents:

7d5e7da

git-author:

Stuart Prescott <stuart@…> (01/19/18 15:59:53)

git-committer:

Stuart Prescott <stuart@…> (05/04/18 23:23:09)

Message:

Fix race condition in test

transform_isrunning() returns False both before the calculation has started
and also after the calculation has finished. The test of the transformation
was only considering the latter case and so was regularly failing on the
reproducible-builds.org test infrastructure.

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