Changeset 932519a in sasview for test

Timestamp:

Sep 19, 2017 2:07:00 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

86ba9d6

Parents:

1f21a43 (diff), b22e23e (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 corfunc3d

Location:

test

Files:

• corfunc/test/utest_corfunc.py (modified) (1 diff)
• corfunc/test/gamma1_out.txt (added)
• corfunc/test/gamma3_out.txt (added)
• corfunc/test/idf_out.txt (added)
• utest_sasview.py (modified) (2 diffs)

test/corfunc/test/utest_corfunc.py

@@ -27 +27 @@
         self.calculator.background = 0.3
         self.extrapolation = None
+        self.transformation = None
         self.results = [np.loadtxt(filename+"_out.txt").T[2]
                         for filename in ("gamma1", "gamma3", "idf")]

test/utest_sasview.py

@@ -62 +62 @@
                     proc = subprocess.Popen(code, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT)
                     std_out, std_err = proc.communicate()
-                    #print std_out
+                    #print(">>>>>> standard out", file_path, "\n", std_out, "\n>>>>>>>>> end stdout", file_path)
                     #sys.exit()
                     m = re.search("Ran ([0-9]+) test", std_out)
@@ -82 +82 @@
                         failed += 1
                         print("Result for %s (%s): FAILED" % (module_name, module_dir))
-                        print(std_out)
+                        #print(std_out)
                     else:
                         passed += 1