Changeset aa01d07b in sasview

Timestamp:

Nov 12, 2012 12:40:47 PM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

657e52c

Parents:

f368fd9

Message:

skip test if wx can't be found (we're only testing the framework)

File:

• test/utest_sansview.py (modified) (1 diff)

test/utest_sansview.py

@@ -10 +10 @@
 
 # Check whether we have matplotlib installed
-HAS_MPL = True
+HAS_MPL_WX = True
 try:
     import matplotlib
+    import wx
 except:
-    HAS_MPL = False
+    HAS_MPL_WX = False
 
 SKIPPED_DIRS = ["sansrealspace", "calculatorview"]
-if not HAS_MPL:
+if not HAS_MPL_WX:
     SKIPPED_DIRS.append("sansguiframe")