work with coverage

Author: randy3k

.circleci/config.yml

@@ -57,7 +57,8 @@ commands:
           command: |
             source $HOME/miniconda/bin/activate myenv
             python -m pip install -e .[test]
-            pytest -s --cov=radian
+            pytest -s
+            coverage combine
             python -m pip install codecov
             codecov
 

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+parallel = True

.gitignore

@@ -4,3 +4,4 @@ dist/
 radian.egg-info/
 .pytest_cache/
 .eggs/
+.coverage

appveyor.yml

@@ -37,8 +37,8 @@ install:
   - python -m pip install --upgrade setuptools pip
   - python -m pip install -e .[test]
 build_script:
-  - pytest -s --cov=radian
-after_build:
+  - pytest -s
+  - coverage combine
   - python -m pip install codecov
   - codecov
 # on_failure:

radian/__init__.py

@@ -3,7 +3,7 @@
 __all__ = ["get_app", "main"]
 
 
-def main():
+def main(cleanup=None):
     import optparse
     import os
     import sys
@@ -22,6 +22,7 @@ def main():
     parser.add_option("--ask-save", action="store_true", dest="ask_save", help="Ask to save R data")
     parser.add_option("--restore-data", action="store_true", dest="restore_data", help="Restore previously saved objects")
     parser.add_option("--debug", action="store_true", dest="debug", help="Debug mode")
+    parser.add_option("--coverage", action="store_true", dest="coverage", help=optparse.SUPPRESS_HELP)
 
     options, args = parser.parse_args()
 
@@ -71,7 +72,19 @@ def main():
                 os.execv(sys.executable, [sys.executable, "-m", "radian"] + sys.argv[1:])
 
     from .radianapp import RadianApplication
-    RadianApplication(r_home, ver=__version__).run(options)
+
+    if options.coverage:
+        import coverage
+        cov = coverage.Coverage()
+        cov.start()
+
+        def cleanup(x):
+            cov.stop()
+            cov.save()
+    else:
+        cleanup = None
+
+    RadianApplication(r_home, ver=__version__).run(options, cleanup)
 
 
 def get_app():

radian/__main__.py

@@ -1,4 +1,4 @@
-if __name__ == "__main__":
-    from radian import main
+from radian import main
 
+if __name__ == '__main__':
     main()

radian/radianapp.py

@@ -52,7 +52,7 @@ def set_env_vars(self, options):
         os.environ["R_INCLUDE_DIR"] = include_dir
         os.environ["R_SHARE_DIR"] = share_dir
 
-    def run(self, options):
+    def run(self, options, cleanup=None):
         from .prompt import create_radian_prompt_session
         from .read_console import create_read_console
         import rchitect
@@ -87,10 +87,13 @@ def run(self, options):
 
         from . import rutils
         rutils.execute_key_bindings_script()
+        if cleanup:
+            rutils.finalizer(cleanup)
 
         from . import reticulate
         reticulate.hooks()
 
+
         # print welcome message
         if options.quiet is not True:
             self.session.app.output.write(rchitect.interface.greeting())

radian/rutils.py

@@ -30,3 +30,10 @@ def execute_key_bindings_script(*args):
         ("base", "source"),
         os.path.join(os.path.dirname(__file__), "R", "key_bindings.R"),
         rcall("new.env"))
+
+
+def finalizer(cleanup):
+    rcall(("base", "reg.finalizer"),
+          rcall(("base", "getOption"), "rchitect.py_tools"),
+          cleanup,
+          onexit=True)

setup.py

@@ -22,9 +22,8 @@ def get_version(package):
 
 
 tests_deps = [
+    "coverage",
     "pytest",
-    "pytest-mock",
-    "pytest-cov",
     "pyte>=0.8.0",
     "pexpect",
     "pywinpty" if sys.platform.startswith("win") else "ptyprocess"

tests/test_startup.py

@@ -2,9 +2,10 @@
 import sys
 from helpers import assert_equal, assert_startswith, screen_process
 
+radian_command = [sys.executable, "-m", "radian", "--coverage"]
+
 
 def test_startup():
-    radian_command = [sys.executable, "-m", "radian"]
 
     with screen_process(radian_command) as (screen, process):
         assert_startswith(lambda: screen.display[0], "R ")
@@ -16,7 +17,11 @@ def test_startup():
         process.sendintr()
         assert_startswith(lambda: screen.display[7], "r$>")
         assert_equal(lambda: (screen.cursor.x, screen.cursor.y), (4, 7))
+        process.write(b"q()\n")
+        assert_equal(lambda: process.isalive(), False)
+
 
+def test_version():
     with screen_process(radian_command + ["--version"]) as (screen, process):
         assert_startswith(lambda: screen.display[0], "radian version: ")
         import radian