Changeset 111e52a in sasview

Timestamp:

Dec 1, 2011 9:51:40 AM (13 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:

c6ccf852

Parents:

0b11a4c

Message:

Re #5 fixing unit tests on windows

File:

• test/utest_sansview.py (modified) (2 diffs)

test/utest_sansview.py

@@ -5 +5 @@
 SKIPPED_DIRS = ["sansrealspace", "calculatorview"]
 SANSVIEW_DIR = os.pardir
+COMMAND_SEP = ';'
+if os.name == 'nt':
+    COMMAND_SEP = '&'
 
 def run_tests():
@@ -26 +29 @@
                 if os.path.isfile(file_path) and f.startswith("utest_") and f.endswith(".py"):
                     module_name,_ = os.path.splitext(f)
-                    code = "cd %s;python -c \"import sys;import xmlrunner;import unittest;sys.path.insert(0, '%s');" % (module_dir, module_dir)
+                    code = "cd %s%spython -c \"import sys;import xmlrunner;import unittest;sys.path.insert(0, '%s');" % (module_dir, COMMAND_SEP, module_dir)
                     code += "from %s import *;" % module_name
                     code += "unittest.main(testRunner=xmlrunner.XMLTestRunner(output='logs'))\""