mutmut 3.1.0__tar.gz → 3.2.0__tar.gz

{mutmut-3.1.0 → mutmut-3.2.0}/AUTHORS.rst

@@ -20,3 +20,4 @@ Credits
 * Emil Stenström <emil@emilstenstrom.se>
 * Roxane Bellott <roxane.bellot@gmail.com>
 * Tomáš Chvátal <tchvatal@suse.com>
+* Frank Hoffmann <15r10nk-git@polarbit.de>

{mutmut-3.1.0 → mutmut-3.2.0}/HISTORY.rst

@@ -1,6 +1,20 @@
 Changelog
 ---------
 
+3.2.0
+~~~~~
+
+* Timeouts for mutants implemented.
+
+* Browser: syntax highlighting for diff view
+
+* More fixes for generators.
+
+* Fix for `src`-style layout of projects.
+
+* Fixed bug where mutmut would recollect all tests on every run, slowing down startup.
+
+
 3.1.0
 ~~~~~
 

{mutmut-3.1.0 → mutmut-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mutmut
-Version: 3.1.0
+Version: 3.2.0
 Summary: mutation testing for Python 3
 Home-page: https://github.com/boxed/mutmut
 Author: Anders Hovmöller

{mutmut-3.1.0 → mutmut-3.2.0}/mutmut/__init__.py

@@ -1,10 +1,12 @@
+from collections import defaultdict
+
 from parso.python.tree import (
     Keyword,
     Name,
     Number,
 )
 
-__version__ = '3.1.0'
+__version__ = '3.2.0'
 
 
 # We have a global whitelist for constants of the pattern __all__, __version__, etc
@@ -22,6 +24,13 @@ dunder_whitelist = [
     'copyright',
 ]
 
+duration_by_test = {}
+stats_time = None
+config = None
+
+_stats = set()
+tests_by_mangled_function_name = defaultdict(set)
+
 
 class SkipException(Exception):
     pass

{mutmut-3.1.0 → mutmut-3.2.0}/mutmut/__main__.py

@@ -25,6 +25,7 @@ from functools import lru_cache
 from hashlib import md5
 from io import TextIOBase
 from json import JSONDecodeError
+from math import ceil
 from os import (
     makedirs,
     walk,
@@ -36,7 +37,10 @@ from textwrap import (
     dedent,
     indent,
 )
+import resource
+
 from threading import Thread
+from time import process_time
 from typing import (
     Dict,
     List,
@@ -51,7 +55,6 @@ from setproctitle import setproctitle
 
 import mutmut
 
-mutmut.duration_by_test = {}
 
 # Document: surviving mutants are retested when you ask mutmut to retest them, interactively in the UI or via command line
 
@@ -71,9 +74,6 @@ NEVER_MUTATE_FUNCTION_NAMES = {'__getattribute__', '__setattr__'}
 NEVER_MUTATE_FUNCTION_CALLS = {'isinstance', 'len'}
 CLASS_NAME_SEPARATOR = 'ǁ'
 
-mutmut._stats = set()
-mutmut.tests_by_mangled_function_name = defaultdict(set)
-
 
 status_by_exit_code = {
     1: 'killed',
@@ -86,6 +86,7 @@ status_by_exit_code = {
     34: 'skipped',
     35: 'suspicious',
     36: 'timeout',
+    152: 'timeout',  # SIGXCPU
 }
 
 emoji_by_status = {
@@ -189,18 +190,18 @@ def _mutmut_trampoline(orig, mutants, *args, **kwargs):
     elif mutant_under_test == 'stats':
         from mutmut.__main__ import record_trampoline_hit
         record_trampoline_hit(orig.__module__ + '.' + orig.__name__)
-        ret orig(*args, **kwargs)
-        return  # for the yield case
+        result = orig(*args, **kwargs)
+        return result  # for the yield case
     prefix = orig.__module__ + '.' + orig.__name__ + '__mutmut_'
     if not mutant_under_test.startswith(prefix):
-        ret orig(*args, **kwargs)
-        return  # for the yield case
+        result = orig(*args, **kwargs)
+        return result  # for the yield case
     mutant_name = mutant_under_test.rpartition('.')[-1]
-    ret mutants[mutant_name](*args, **kwargs)
+    result = mutants[mutant_name](*args, **kwargs)
+    return result
 
 """
-yield_from_trampoline_impl = trampoline_impl.replace('ret ', 'yield from ').replace('_mutmut_trampoline', '_mutmut_yield_from_trampoline')
-trampoline_impl = trampoline_impl.replace('ret ', 'return ')
+yield_from_trampoline_impl = trampoline_impl.replace('result = ', 'result = yield from ').replace('_mutmut_trampoline', '_mutmut_yield_from_trampoline')
 
 
 def create_mutants():
@@ -257,7 +258,8 @@ def create_mutants_for_file(filename, output_path):
             exit(1)
 
     source_file_mutation_data = SourceFileMutationData(path=filename)
-    module_name = str(filename)[:-len(filename.suffix)].replace(os.sep, '.')
+    module_name = strip_prefix(str(filename)[:-len(filename.suffix)].replace(os.sep, '.'), prefix='src.')
+
     source_file_mutation_data.exit_code_by_key = {
          '.'.join([module_name, x]).replace('.__init__.', '.'): None
         for x in mutant_names
@@ -314,17 +316,18 @@ def build_trampoline(*, orig_name, mutants, class_name, is_generator):
         access_suffix = '")'
 
     if is_generator:
-        return_or_yield_statement = 'yield from'
+        yield_statement = 'yield from '  # note the space at the end!
         trampoline_name = '_mutmut_yield_from_trampoline'
     else:
-        return_or_yield_statement = 'return'
+        yield_statement = ''
         trampoline_name = '_mutmut_trampoline'
 
     return f"""
 {mutants_dict}
 
 def {orig_name}({'self, ' if class_name is not None else ''}*args, **kwargs):
-    {return_or_yield_statement} {trampoline_name}({access_prefix}{mangled_name}__mutmut_orig{access_suffix}, {access_prefix}{mangled_name}__mutmut_mutants{access_suffix}, *args, **kwargs) 
+    result = {yield_statement}{trampoline_name}({access_prefix}{mangled_name}__mutmut_orig{access_suffix}, {access_prefix}{mangled_name}__mutmut_mutants{access_suffix}, *args, **kwargs)
+    return result 
 
 {orig_name}.__signature__ = _mutmut_signature({mangled_name}__mutmut_orig)
 {mangled_name}__mutmut_orig.__name__ = '{mangled_name}'
@@ -655,28 +658,32 @@ def change_cwd(path):
         os.chdir(old_cwd)
 
 
+def collected_test_names():
+    return {
+        test_name
+        for _, test_names in mutmut.tests_by_mangled_function_name.items()
+        for test_name in test_names
+    }
+
+
 class ListAllTestsResult:
     def __init__(self, *, ids):
         assert isinstance(ids, set)
         self.ids = ids
 
-    @staticmethod
-    def old_tests():
-        return {
-            test_name
-            for _, test_names in mutmut.tests_by_mangled_function_name.items()
-            for test_name in test_names
-        }
-
     def clear_out_obsolete_test_names(self):
+        count_before = len(mutmut.tests_by_mangled_function_name)
         mutmut.tests_by_mangled_function_name = {
-            k: {test_name for test_name in test_names if test_name not in self.ids}
+            k: {test_name for test_name in test_names if test_name in self.ids}
             for k, test_names in mutmut.tests_by_mangled_function_name.items()
         }
-        save_stats()
+        count_after = len(mutmut.tests_by_mangled_function_name)
+        if count_before != count_after:
+            print(f'Removed {count_before - count_after} obsolete test names')
+            save_stats()
 
     def new_tests(self):
-        return self.ids - self.old_tests()
+        return self.ids - collected_test_names()
 
 
 class PytestRunner(TestRunner):
@@ -779,12 +786,13 @@ def mangled_name_from_mutant_name(mutant_name):
 
 def orig_function_and_class_names_from_key(mutant_name):
     r = mangled_name_from_mutant_name(mutant_name)
+    _, _, r = r.rpartition('.')
     class_name = None
     if CLASS_NAME_SEPARATOR in r:
         class_name = r[r.index(CLASS_NAME_SEPARATOR) + 1: r.rindex(CLASS_NAME_SEPARATOR)]
         r = r[r.rindex(CLASS_NAME_SEPARATOR) + 1:]
     else:
-        assert r.startswith('x_')
+        assert r.startswith('x_'), r
         r = r[2:]
     return r, class_name
 
@@ -869,8 +877,7 @@ def run_forced_fail(runner):
     with CatchOutput(show_spinner=True, spinner_title='running forced fail test') as catcher:
         try:
             if runner.run_forced_fail() == 0:
-                catcher.stop()
-                print('\n'.join(catcher.strings))
+                catcher.dump_output()
                 print("FAILED")
                 os._exit(1)
         except MutmutProgrammaticFailException:
@@ -902,6 +909,8 @@ class CatchOutput:
         sys.stderr = sys.__stderr__
 
     def start(self):
+        if self.show_spinner:
+            print_status(self.spinner_title)
         sys.stdout = self.redirect
         sys.stderr = self.redirect
 
@@ -979,6 +988,8 @@ def run_stats_collection(runner, tests=None):
 
     os.environ['MUTANT_UNDER_TEST'] = 'stats'
     os.environ['PY_IGNORE_IMPORTMISMATCH'] = '1'
+    start_cpu_time = process_time()
+
     with CatchOutput(show_spinner=True, spinner_title='running stats') as output_catcher:
         collect_stats_exit_code = runner.run_stats(tests=tests)
         if collect_stats_exit_code != 0:
@@ -987,8 +998,10 @@ def run_stats_collection(runner, tests=None):
             exit(1)
 
     print('    done')
+    if not tests:  # again, meaning all
+        mutmut.stats_time = process_time() - start_cpu_time
 
-    if not mutmut.tests_by_mangled_function_name:
+    if not collected_test_names():
         print('failed to collect stats, no active tests found')
         exit(1)
 
@@ -1028,6 +1041,7 @@ def load_stats():
             for k, v in data.pop('tests_by_mangled_function_name').items():
                 mutmut.tests_by_mangled_function_name[k] |= set(v)
             mutmut.duration_by_test = data.pop('duration_by_test')
+            mutmut.stats_time = data.pop('stats_time')
             assert not data, data
             did_load = True
     except (FileNotFoundError, JSONDecodeError):
@@ -1040,6 +1054,7 @@ def save_stats():
         json.dump(dict(
             tests_by_mangled_function_name={k: list(v) for k, v in mutmut.tests_by_mangled_function_name.items()},
             duration_by_test=mutmut.duration_by_test,
+            stats_time=mutmut.stats_time,
         ), f, indent=4)
 
 
@@ -1220,6 +1235,9 @@ def run(mutant_names, *, max_children):
                 if not tests:
                     os._exit(33)
 
+                estimated_time_of_tests = sum(mutmut.duration_by_test[test_name] for test_name in tests) + 1
+                resource.setrlimit(resource.RLIMIT_CPU, (ceil(estimated_time_of_tests * 2), ceil(estimated_time_of_tests * 2)))
+
                 with CatchOutput():
                     result = runner.run_tests(mutant_name=mutant_name, tests=tests)
 
@@ -1427,7 +1445,9 @@ def browse():
     from textual.containers import Container
     from textual.widgets import Footer
     from textual.widgets import DataTable
-    from textual.widgets import TextArea
+    from textual.widgets import Static
+    from textual.widget import Widget
+    from rich.syntax import Syntax
 
     class ResultBrowser(App):
         loading_id = None
@@ -1454,7 +1474,8 @@ def browse():
             with Container(classes='container'):
                 yield DataTable(id='files')
                 yield DataTable(id='mutants')
-            yield TextArea(id='diff_view')
+            with Widget(id="diff_view_widget"):
+                yield Static(id='diff_view')
             yield Footer()
 
         def on_mount(self):
@@ -1513,9 +1534,9 @@ def browse():
                 assert event.data_table.id == 'mutants'
                 diff_view = self.query_one('#diff_view')
                 if event.row_key.value is None:
-                    diff_view.text = ''
+                    diff_view.update('')
                 else:
-                    diff_view.text = '<loading...>'
+                    diff_view.update('<loading...>')
                     self.loading_id = event.row_key.value
 
                     def load_thread():
@@ -1523,9 +1544,9 @@ def browse():
                         try:
                             d = get_diff_for_mutant(event.row_key.value)
                             if event.row_key.value == self.loading_id:
-                                diff_view.text = d
+                                diff_view.update(Syntax(d, "diff"))
                         except Exception as e:
-                            diff_view.text = f'<{e}>'
+                            diff_view.update(f"<{type(e)} {e}>")
 
                     t = Thread(target=load_thread)
                     t.start()

{mutmut-3.1.0 → mutmut-3.2.0}/mutmut/result_browser_layout.tcss

@@ -24,3 +24,11 @@ DataTable:focus .datatable--cursor {
     color: black;
     background: orange;
 }
+
+#diff_view_widget {
+    height: 50%;
+    overflow-y: scroll;
+}
+
+#diff_view {
+}

{mutmut-3.1.0 → mutmut-3.2.0}/mutmut.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mutmut
-Version: 3.1.0
+Version: 3.2.0
 Summary: mutation testing for Python 3
 Home-page: https://github.com/boxed/mutmut
 Author: Anders Hovmöller