Changeset 9687d58 in sasview for test

Timestamp:

Apr 10, 2017 2:01:46 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

6c8fb2c

Parents:

9208346 (diff), c6f3aec (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.

Message:

Merge branch 'master' into ESS_GUI

Location:

test

Files:

• corfunc/test/98929.txt (added)
• corfunc/test/utest_corfunc.py (added)
• fileconverter/test/cansas1d.xml (added)
• fileconverter/test/exp18_14_igor_2dqxqy.dat (added)
• fileconverter/test/export2d.h5 (added)
• fileconverter/test/utest_nxcansas_writer.py (added)
• sasdataloader/test/utest_ascii.py (modified) (1 diff)

test/sasdataloader/test/utest_ascii.py

@@ -92 +92 @@
         """
         # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_6.txt")
+        f = None
+        try:
+            f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(f, None)
+        except:
+            self.assertEqual(f, None)
         
 if __name__ == '__main__':