Changeset 4d465e3 in sasview for test

Timestamp:

Apr 9, 2017 4:03:36 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a79ab31

Parents:

aa45dcd (diff), ec65dc81 (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' of github.com:SasView/sasview

Location:

test

Files:

• fileconverter/test/export2d.h5 (modified) (previous)
• sasdataloader/test/testplugings.py (modified) (2 diffs)
• sasdataloader/test/sesans_examples/sphere2micron.ses (added)
• sasdataloader/test/sesans_examples/sphere_isis.ses (added)
• sasdataloader/test/utest_sesans.py (added)

test/sasdataloader/test/testplugings.py

@@ -32 +32 @@
         output = self.L.load('test_data.test')
         self.assertEqual(output.x[0], 1234.)
-        self.assertTrue(self.L.loaders.has_key('.test'))
+        self.assertTrue('.test' in self.L.loaders)
         
 class testZip(unittest.TestCase):
@@ -61 +61 @@
         output = self.L.load('test_data.test')
         self.assertEqual(output.x[0], 1234.)
-        self.assertTrue(self.L.loaders.has_key('.test'))
+        self.assertTrue('.test' in self.L.loaders)