Mercurial > repos > fubar > tool_factory_2

changeset 78:89aca6c67405 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author fubar
date Tue, 17 Nov 2020 06:04:40 +0000
parents 1fa49a9a4ec5
children 2d0272e730d1
files toolfactory/rgToolFactory2.py
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/toolfactory/rgToolFactory2.py	Mon Nov 16 23:24:05 2020 +0000
+++ b/toolfactory/rgToolFactory2.py	Tue Nov 17 06:04:40 2020 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+
 # rgToolFactory.py
 # see https://github.com/fubar2/toolfactory
 #
@@ -882,6 +882,7 @@
         planemo test --engine docker_galaxy --database_type docker_postgres --galaxy_root /galaxy-central pyrevpos/pyrevpos.xml
         """
         xreal = "%s.xml" % self.tool_name
+        tool_test_path = os.path.join(self.repdir,f"{self.tool_name}_planemo_test_report.html")
         if os.path.exists(self.tlog):
             tout = open(self.tlog, "a")
         else:
@@ -891,25 +892,30 @@
             cll = [
                 "planemo",
                 "test",
+                "--test_output_xunit",os.path.join(self.repdir,f"{self.tool_name}_xunit.xml")
+                "--test_data", os.path.abspath(self.testdir),
+                "--test_output", os.path.abspath(tool_test_path),
                 "--galaxy_root",
                 self.args.galaxy_root,
                 "--update_test_data",
-                xreal,
+                os.path.abspath(xreal),
             ]
             p = subprocess.run(
                 cll,
                 shell=False,
                 cwd=self.tooloutdir,
-                stderr=dummy,
-                stdout=dummy,
+                stderr=tout,
+                stdout=tout,
             )
         else:
             cll = [
                 "planemo",
                 "test",
+                "--test_data", self.testdir,
+                "--test_output", tool_test_path,
                 "--galaxy_root",
                 self.args.galaxy_root,
-                xreal,
+                os.path.abspath(xreal),
             ]
             p = subprocess.run(
                 cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout