Commit: fe53471457f20c77dc0cff8ab0e8376375aa054a - Pathways (hg)

Commit MetaInfo

• Revisión: fe53471457f20c77dc0cff8ab0e8376375aa054a (tree)
• Tiempo: 2018-11-12 01:16:33
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

small textual refactoring

Cambiar Resumen

• modified: pathways/__main__.py
• modified: pathways/core/config.py
• modified: pathways/puts/webput.py
• modified: pathways/runners/probes.py
• modified: pathways/runners/run.py

Diferencia incremental

diff -r 1f2f5f5b59f6 -r fe53471457f2 pathways/__main__.py
--- a/pathways/__main__.py	Sun Nov 04 15:40:54 2018 +0100
+++ b/pathways/__main__.py	Sun Nov 11 17:16:33 2018 +0100
@@ -45,7 +45,7 @@
         ATS = pm.load(os.path.splitext(os.path.basename(ATSfile))[0], extend_path=True)
 
         # Run the ATSes in the file
-        for ats in discover(ATS.__dict__):
+        for ats in discover(ATS.__dict__):                              # GAM XXX: Why is this loop here? Should it be in "ATS" (representing the file) ...?
             test_count+=1
             run_ATS(ats, probe=probe)
 

diff -r 1f2f5f5b59f6 -r fe53471457f2 pathways/core/config.py
--- a/pathways/core/config.py	Sun Nov 04 15:40:54 2018 +0100
+++ b/pathways/core/config.py	Sun Nov 11 17:16:33 2018 +0100
@@ -33,6 +33,7 @@
 
 
 class Config:
+    """ .. todo:: Doc Config"""
 
     def __init__(self, cfgdir=None, cwd=None, argparse=False):
         """Create a Config object;

diff -r 1f2f5f5b59f6 -r fe53471457f2 pathways/puts/webput.py
--- a/pathways/puts/webput.py	Sun Nov 04 15:40:54 2018 +0100
+++ b/pathways/puts/webput.py	Sun Nov 11 17:16:33 2018 +0100
@@ -93,9 +93,10 @@
         from selenium import webdriver
         from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
-        HACK = r"~/work/Pathways/TMP/geckodriver"                       # XXX
-        logger.debug("XXX HACK=%s", HACK)                               # XXX
+        # Use 'BIN_PATH' Cfg value - After fixing :ref:`bug-cgfput`     # XXX
+        HACK = r"~/work/Pathways/TMP/" + 'geckodriver'                  # XXX
         ff_driver = os.path.expanduser(os.path.expandvars(HACK))        # XXX
+        logger.debug("HACK: ff_driver=%s", ff_driver )                  # XXX
 
         caps = DesiredCapabilities.FIREFOX
         caps["marionette"] = True

diff -r 1f2f5f5b59f6 -r fe53471457f2 pathways/runners/probes.py
--- a/pathways/runners/probes.py	Sun Nov 04 15:40:54 2018 +0100
+++ b/pathways/runners/probes.py	Sun Nov 11 17:16:33 2018 +0100
@@ -16,8 +16,7 @@
 
    probeTracer
       Accessable via ``probe.trace.FUNC`` and should be used to *track & trace* the ATS (testing progress)
-      within the pathways-framework. Both in this file and others.
-   moduleLogger
+      within the pathways-framework. Both in this file and other moduleLogger
       As in most modules, it is possible to *"debug"* this module too; via the ``logger.FUNC`` interface.
 """
 

diff -r 1f2f5f5b59f6 -r fe53471457f2 pathways/runners/run.py
--- a/pathways/runners/run.py	Sun Nov 04 15:40:54 2018 +0100
+++ b/pathways/runners/run.py	Sun Nov 11 17:16:33 2018 +0100
@@ -64,12 +64,16 @@
 
 def discover(d):
     """Find all ATSes in a module-or-frame dict, and return a list, sorted in code-order"""
+
     atses  = [ func for (name, func) in d.items()  if name.startswith('ATS_') and callable(func) ]
     atses.sort(key=lambda f :  f.__code__.co_firstlineno) # Sort them to file order!
+
     probes.currentProbe.trace.info("Discovered: %s", ", ".join(ats.__name__ for ats in atses))
+
     return atses
 
 
+
 def autorun():
     """Automatically run all ATSes in the current ATS-file. Typically used at (the bottom of) each ATS, to run that test-file manually: