Changeset 4342fed0 in sasview for test

Timestamp:

Apr 9, 2017 8:09:12 AM (7 years ago)

Author:

GitHub <noreply@…>

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:

fca1f50

Parents:

5b2b04d (diff), 45dffa69 (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 Butler <butlerpd@…> (04/09/17 08:09:12)

git-committer:

GitHub <noreply@…> (04/09/17 08:09:12)

Message:

Merge pull request #67 from andyfaff/is_none

MAINT: use 'is None' instead of '== None'

Location:

test

Files:

• pr_inversion/test/utest_invertor.py (modified) (1 diff)
• sasdataloader/test/utest_cansas.py (modified) (1 diff)
• sasrealspace/test/sim_validation.py (modified) (2 diffs)
• sasrealspace/test/utest_realspace.py (modified) (2 diffs)

test/pr_inversion/test/utest_invertor.py

@@ -576 +576 @@
     data_err = np.zeros(0)
     scale    = None
-    if not path == None:
+    if path is not None:
         input_f = open(path,'r')
         buff    = input_f.read()

test/sasdataloader/test/utest_cansas.py

@@ -103 +103 @@
         self.assertAlmostEqual(data.detector[1].distance, 4145.02)
         self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML")
-        self.assertTrue(data.meta_data["xmlpreprocess"] != None)
+        self.assertTrue(data.meta_data["xmlpreprocess"] is not None)
 
 

test/sasrealspace/test/sim_validation.py

@@ -32 +32 @@
             #return: mean, error
         """
-        if not density == None:
+        if density is not None:
             self.density = density
             self.create()
@@ -45 +45 @@
             #return: mean, error
         """
-        if not density == None:
+        if density is not None:
             self.density = density
             self.create()

test/sasrealspace/test/utest_realspace.py

@@ -326 +326 @@
         self.canvas.setParam('%s.radius' % handle, self.outer_radius)
         self.canvas.setParam('%s.contrast' % handle, self.shell_sld)
-        if not order1 == None:
+        if order1 is not None:
             self.canvas.setParam('%s.order' % handle, order1)
        
@@ -332 +332 @@
         self.canvas.setParam('%s.radius' % handle2, self.radius)
         self.canvas.setParam('%s.contrast' % handle2, 1.0)
-        if not order2 == None:
+        if order2 is not None:
             self.canvas.setParam('%s.order' % handle2, order2)