From 58612a23c974ac0243b63756e87cc8b98e4c1686 Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Wed, 5 Oct 2022 09:16:07 +0200 Subject: [PATCH] Resolve some pylint reported improvement cases Refactored reported inconsistent return statements to returning 'None' although this is implicitly done. Adds disable unexpected-keyword-arg to avoid false report for unitt_invalid_res_config test. Adds no-op pass statement to avoid pylint reported try-except-raise in exception handling. Replace Sphinx copyright variable with alias project_copyright. Renames variables using keywords func, sum, iter, hash, dir, filter, input. Adds default value for _func argument in plugin-response decorator. Adds guard if _func is not provided, plugin-response function shall return 'None'. --- docs/conf.py | 2 +- src/ert/_c_wrappers/config/config_parser.py | 6 +++--- .../_c_wrappers/enkf/config/enkf_config_node.py | 1 + src/ert/_c_wrappers/fm/shell/shell.py | 4 ++-- .../_c_wrappers/job_queue/environment_varlist.py | 8 ++++---- src/ert/_c_wrappers/job_queue/ext_joblist.py | 2 ++ src/ert/_c_wrappers/job_queue/workflow_runner.py | 2 +- .../ertwidgets/analysismodulevariablespanel.py | 2 ++ src/ert/gui/ertwidgets/checklist.py | 8 ++++---- src/ert/gui/ertwidgets/models/all_cases_model.py | 2 ++ src/ert/gui/ertwidgets/searchbox.py | 2 +- src/ert/gui/simulation/view/realization.py | 4 ++-- .../plot/customize/limits_customization_view.py | 16 ++++++++-------- .../gui/tools/plot/data_type_keys_list_model.py | 2 ++ src/ert/gui/tools/plot/data_type_keys_widget.py | 4 ++-- src/ert/gui/tools/plot/filter_popup.py | 6 +++--- src/ert/gui/tools/plot/plot_case_model.py | 2 ++ src/ert/shared/ensemble_evaluator/client.py | 2 +- src/ert/shared/plugins/plugin_response.py | 10 +++++++--- test-data/mini_ert/jobs/aggregator.py | 4 ++-- .../ensemble_evaluator_utils.py | 4 ++-- .../prefect/scripts/evaluate_coeffs.py | 2 ++ .../test_ensemble_evaluator.py | 14 +++++++------- .../ert_tests/ensemble_evaluator/test_monitor.py | 6 +++--- .../gui/simulation/view/test_realization.py | 12 ++++++------ tests/ert_tests/services/test_base_service.py | 2 +- tests/libres_tests/res/enkf/test_enkf_main.py | 4 +++- tests/libres_tests/res/util/test_subprocess.py | 2 ++ 28 files changed, 78 insertions(+), 57 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 71d7252d7c1..427a76d28de 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ # -- Project information ----------------------------------------------------- project = "ERT" -copyright = "Equinor ASA" +project_copyright = "Equinor ASA" author = "SCOUT - ScientifiC cOmpUTing team" dist_version = get_distribution("ert").version diff --git a/src/ert/_c_wrappers/config/config_parser.py b/src/ert/_c_wrappers/config/config_parser.py index 2a1c135eb13..7f5ecc84a4f 100644 --- a/src/ert/_c_wrappers/config/config_parser.py +++ b/src/ert/_c_wrappers/config/config_parser.py @@ -99,10 +99,10 @@ def parse( assert isinstance(unrecognized, UnrecognizedEnum) - hash = StringHash() + hash_value = StringHash() if pre_defined_kw_map is not None: for key in pre_defined_kw_map: - hash[key] = pre_defined_kw_map[key] + hash_value[key] = pre_defined_kw_map[key] if not os.path.exists(config_file): raise IOError(f"File: {config_file} does not exists") @@ -111,7 +111,7 @@ def parse( comment_string, include_kw, define_kw, - hash, + hash_value, unrecognized, validate, ) diff --git a/src/ert/_c_wrappers/enkf/config/enkf_config_node.py b/src/ert/_c_wrappers/enkf/config/enkf_config_node.py index d1254b5c342..984991b91c9 100644 --- a/src/ert/_c_wrappers/enkf/config/enkf_config_node.py +++ b/src/ert/_c_wrappers/enkf/config/enkf_config_node.py @@ -440,6 +440,7 @@ def getModelConfig(self): f"Unhandled implementation model type: {implementation_type:i}" ) ) + return None def getKey(self): return self._get_key() diff --git a/src/ert/_c_wrappers/fm/shell/shell.py b/src/ert/_c_wrappers/fm/shell/shell.py index 3a61364587c..8b637c61662 100644 --- a/src/ert/_c_wrappers/fm/shell/shell.py +++ b/src/ert/_c_wrappers/fm/shell/shell.py @@ -133,8 +133,8 @@ def deleteDirectory(path): for file in files: Shell.__deleteFile(os.path.join(root, file)) - for dir in dirs: - Shell.__deleteDirectory(os.path.join(root, dir)) + for _dir in dirs: + Shell.__deleteDirectory(os.path.join(root, _dir)) else: raise IOError(f"Entry:'{path}' is not a directory") diff --git a/src/ert/_c_wrappers/job_queue/environment_varlist.py b/src/ert/_c_wrappers/job_queue/environment_varlist.py index 8e7a39eb1ca..226ddd0b7c4 100644 --- a/src/ert/_c_wrappers/job_queue/environment_varlist.py +++ b/src/ert/_c_wrappers/job_queue/environment_varlist.py @@ -33,13 +33,13 @@ class EnvironmentVarlist(BaseCClass): "void env_varlist_update_path(env_varlist, char*, char*)" ) - def __init__(self, vars: Optional[Dict[str, str]] = None): - if vars is None: - vars = {} + def __init__(self, _vars: Optional[Dict[str, str]] = None): + if _vars is None: + _vars = {} c_ptr = self._alloc() super().__init__(c_ptr) - for key, value in vars.items(): + for key, value in _vars.items(): self.setenv(key, value) def setenv(self, key, value): diff --git a/src/ert/_c_wrappers/job_queue/ext_joblist.py b/src/ert/_c_wrappers/job_queue/ext_joblist.py index 1392b545e12..4c8e3b2432b 100644 --- a/src/ert/_c_wrappers/job_queue/ext_joblist.py +++ b/src/ert/_c_wrappers/job_queue/ext_joblist.py @@ -57,6 +57,8 @@ def __getitem__(self, job): if job in self: return self._get_job(job).setParent(self) + return None + def getAvailableJobNames(self) -> StringList: """@rtype: StringList""" return [str(x) for x in self._alloc_list().setParent(self)] diff --git a/src/ert/_c_wrappers/job_queue/workflow_runner.py b/src/ert/_c_wrappers/job_queue/workflow_runner.py index a1c95838db1..291356105c3 100644 --- a/src/ert/_c_wrappers/job_queue/workflow_runner.py +++ b/src/ert/_c_wrappers/job_queue/workflow_runner.py @@ -32,7 +32,7 @@ def __enter__(self): self.run() return self - def __exit__(self, type, value, traceback): + def __exit__(self, _type, value, traceback): self.wait() def run(self): diff --git a/src/ert/gui/ertwidgets/analysismodulevariablespanel.py b/src/ert/gui/ertwidgets/analysismodulevariablespanel.py index cc4a5033c3d..9970a660d95 100644 --- a/src/ert/gui/ertwidgets/analysismodulevariablespanel.py +++ b/src/ert/gui/ertwidgets/analysismodulevariablespanel.py @@ -158,6 +158,8 @@ def widget_from_layout(self, layout: QFormLayout, widget_name: str) -> QWidget: if widget.objectName() == widget_name: return widget + return None + def createSpinBox( self, variable_name, diff --git a/src/ert/gui/ertwidgets/checklist.py b/src/ert/gui/ertwidgets/checklist.py index 9c2d3ffdde9..fb260952e9f 100644 --- a/src/ert/gui/ertwidgets/checklist.py +++ b/src/ert/gui/ertwidgets/checklist.py @@ -120,16 +120,16 @@ def setSelectionEnabled(self, enabled): self._checkAllButton.setEnabled(enabled) self._uncheckAllButton.setEnabled(enabled) - def filterList(self, filter): - filter = filter.lower() + def filterList(self, _filter): + _filter = _filter.lower() for index in range(0, self._list.count()): item = self._list.item(index) text = str(item.text()).lower() - if filter == "": + if _filter == "": item.setHidden(False) - elif filter in text: + elif _filter in text: item.setHidden(False) else: item.setHidden(True) diff --git a/src/ert/gui/ertwidgets/models/all_cases_model.py b/src/ert/gui/ertwidgets/models/all_cases_model.py index 10436b2c6bd..c9ed840fe06 100644 --- a/src/ert/gui/ertwidgets/models/all_cases_model.py +++ b/src/ert/gui/ertwidgets/models/all_cases_model.py @@ -32,6 +32,8 @@ def data(self, index, role=None): if role == Qt.DisplayRole: return item + return None + def itemAt(self, index): assert isinstance(index, QModelIndex) diff --git a/src/ert/gui/ertwidgets/searchbox.py b/src/ert/gui/ertwidgets/searchbox.py index fadec36807b..6620a7d79c2 100644 --- a/src/ert/gui/ertwidgets/searchbox.py +++ b/src/ert/gui/ertwidgets/searchbox.py @@ -17,7 +17,7 @@ def __init__(self): self.presentSearch() self.textChanged.connect(self.__emitFilterChanged) - def __emitFilterChanged(self, filter): + def __emitFilterChanged(self, _filter): self.filterChanged.emit(self.filter()) # self.emit(SIGNAL('filterChanged(PyQt_PyObject)'), self.filter()) diff --git a/src/ert/gui/simulation/view/realization.py b/src/ert/gui/simulation/view/realization.py index e8b1c769852..134129de2bc 100644 --- a/src/ert/gui/simulation/view/realization.py +++ b/src/ert/gui/simulation/view/realization.py @@ -17,10 +17,10 @@ class RealizationWidget(QWidget): - def __init__(self, iter: int, parent=None) -> None: + def __init__(self, _it: int, parent=None) -> None: super().__init__(parent) - self._iter = iter + self._iter = _it self._delegateWidth = 70 self._delegateHeight = 70 diff --git a/src/ert/gui/tools/plot/customize/limits_customization_view.py b/src/ert/gui/tools/plot/customize/limits_customization_view.py index d83390d0ba4..81fe0178142 100644 --- a/src/ert/gui/tools/plot/customize/limits_customization_view.py +++ b/src/ert/gui/tools/plot/customize/limits_customization_view.py @@ -91,31 +91,31 @@ def createIntegerLineEdit(self, minimum=None, maximum=None, placeholder=""): return line_edit def setValue(self, axis_name, value): - input = self._inputs[axis_name] + _input = self._inputs[axis_name] if axis_name in LimitsStack.NUMBER_AXIS: if value is None: - input.setText("") + _input.setText("") else: - input.setText(str(value)) + _input.setText(str(value)) elif axis_name == PlotContext.DATE_AXIS: - input.setDate(value) + _input.setDate(value) def getValue(self, axis_name): - input = self._inputs[axis_name] + _input = self._inputs[axis_name] result = None if axis_name in LimitsStack.FLOAT_AXIS: try: - result = float(input.text()) + result = float(_input.text()) except ValueError: result = None elif axis_name in LimitsStack.INT_AXIS: try: - result = int(input.text()) + result = int(_input.text()) except ValueError: result = None elif axis_name == PlotContext.DATE_AXIS: - result = input.date() + result = _input.date() return result diff --git a/src/ert/gui/tools/plot/data_type_keys_list_model.py b/src/ert/gui/tools/plot/data_type_keys_list_model.py index e18ffb99e15..fba4b07fd48 100644 --- a/src/ert/gui/tools/plot/data_type_keys_list_model.py +++ b/src/ert/gui/tools/plot/data_type_keys_list_model.py @@ -40,6 +40,8 @@ def data(self, index, role=None): if item["observations"]: return self.HAS_OBSERVATIONS + return None + def itemAt(self, index): assert isinstance(index, QModelIndex) diff --git a/src/ert/gui/tools/plot/data_type_keys_widget.py b/src/ert/gui/tools/plot/data_type_keys_widget.py index 25e2d7d03c1..bc39c536acb 100644 --- a/src/ert/gui/tools/plot/data_type_keys_widget.py +++ b/src/ert/gui/tools/plot/data_type_keys_widget.py @@ -70,8 +70,8 @@ def getSelectedItem(self): def selectDefault(self): self.data_type_keys_widget.setCurrentIndex(self.filter_model.index(0, 0)) - def setSearchString(self, filter): - self.filter_model.setFilterFixedString(filter) + def setSearchString(self, _filter): + self.filter_model.setFilterFixedString(_filter) def showFilterPopup(self): self.__filter_popup.show() diff --git a/src/ert/gui/tools/plot/filter_popup.py b/src/ert/gui/tools/plot/filter_popup.py index 60d5fd5e29d..ae8b3653d66 100644 --- a/src/ert/gui/tools/plot/filter_popup.py +++ b/src/ert/gui/tools/plot/filter_popup.py @@ -45,14 +45,14 @@ def __init__(self, parent, key_defs): self.setLayout(layout) self.adjustSize() - def addFilterItem(self, name, id, value=True): - self.filter_items[id] = value + def addFilterItem(self, name, _id, value=True): + self.filter_items[_id] = value check_box = QCheckBox(name) check_box.setChecked(value) def toggleItem(checked): - self.filter_items[id] = checked + self.filter_items[_id] = checked self.filterSettingsChanged.emit(self.filter_items) check_box.toggled.connect(toggleItem) diff --git a/src/ert/gui/tools/plot/plot_case_model.py b/src/ert/gui/tools/plot/plot_case_model.py index 609fc96df75..6b4422e859b 100644 --- a/src/ert/gui/tools/plot/plot_case_model.py +++ b/src/ert/gui/tools/plot/plot_case_model.py @@ -30,6 +30,8 @@ def data(self, index, role=None): if role == Qt.DisplayRole: return item + return None + def itemAt(self, index): assert isinstance(index, QModelIndex) diff --git a/src/ert/shared/ensemble_evaluator/client.py b/src/ert/shared/ensemble_evaluator/client.py index b0e6cb6162d..fbde28b1462 100644 --- a/src/ert/shared/ensemble_evaluator/client.py +++ b/src/ert/shared/ensemble_evaluator/client.py @@ -72,7 +72,7 @@ async def _send(self, msg: AnyStr) -> None: await self.websocket.send(msg) return except ConnectionClosedOK: - # Connection was closed no point in trying to send more messages + pass # Connection was closed no point in trying to send more messages raise except ( ConnectionClosedError, diff --git a/src/ert/shared/plugins/plugin_response.py b/src/ert/shared/plugins/plugin_response.py index 481f548b075..49f71c4dd70 100644 --- a/src/ert/shared/plugins/plugin_response.py +++ b/src/ert/shared/plugins/plugin_response.py @@ -2,10 +2,14 @@ @decorator -def plugin_response(func, plugin_name="", *args, **kwargs): - response = func(*args, **kwargs) +def plugin_response(_func=None, plugin_name="", *args, **kwargs): + + if _func is None: + return None + + response = _func(*args, **kwargs) return ( - PluginResponse(response, PluginMetadata(plugin_name, func.__name__)) + PluginResponse(response, PluginMetadata(plugin_name, _func.__name__)) if response is not None else None ) diff --git a/test-data/mini_ert/jobs/aggregator.py b/test-data/mini_ert/jobs/aggregator.py index 4c7e826a849..df1afc5bf6e 100755 --- a/test-data/mini_ert/jobs/aggregator.py +++ b/test-data/mini_ert/jobs/aggregator.py @@ -10,9 +10,9 @@ with open("aggregated.txt", "w", encoding="utf-8") as output_file: sum_of_sum = 0.0 for key, filename in files.items(): - sum = 0.0 + total = 0.0 with open(filename, "r", encoding="utf-8") as input_file: - sum += float(input_file.readline()) + total += float(input_file.readline()) sum_of_sum += sum output_file.write(f"{key} {sum:f}\n") diff --git a/tests/ert_tests/ensemble_evaluator/ensemble_evaluator_utils.py b/tests/ert_tests/ensemble_evaluator/ensemble_evaluator_utils.py index 29dbbcaa312..450c25d96eb 100644 --- a/tests/ert_tests/ensemble_evaluator/ensemble_evaluator_utils.py +++ b/tests/ert_tests/ensemble_evaluator/ensemble_evaluator_utils.py @@ -46,8 +46,8 @@ def send_dispatch_event(client, event_type, source, event_id, data, **extra_attr class TestEnsemble(_Ensemble): __test__ = False - def __init__(self, iter, reals, steps, jobs, id_): - self.iter = iter + def __init__(self, _iter, reals, steps, jobs, id_): + self.iter = _iter self.test_reals = reals self.steps = steps self.jobs = jobs diff --git a/tests/ert_tests/ensemble_evaluator/prefect/scripts/evaluate_coeffs.py b/tests/ert_tests/ensemble_evaluator/prefect/scripts/evaluate_coeffs.py index 505d0a007fb..a3fe227257c 100644 --- a/tests/ert_tests/ensemble_evaluator/prefect/scripts/evaluate_coeffs.py +++ b/tests/ert_tests/ensemble_evaluator/prefect/scripts/evaluate_coeffs.py @@ -16,6 +16,8 @@ def _evaluate(coeffs, x, degree): if degree >= 2: return coeffs["a"] * x**degree + return None + def config_dump_entry(args=None): arg_parser = argparse.ArgumentParser( diff --git a/tests/ert_tests/ensemble_evaluator/test_ensemble_evaluator.py b/tests/ert_tests/ensemble_evaluator/test_ensemble_evaluator.py index 479767b480e..6825b680535 100644 --- a/tests/ert_tests/ensemble_evaluator/test_ensemble_evaluator.py +++ b/tests/ert_tests/ensemble_evaluator/test_ensemble_evaluator.py @@ -237,7 +237,7 @@ def exploding_handler(events): @pytest.mark.consumer_driven_contract_verification def test_verify_monitor_failing_ensemble(make_ee_config, event_loop): ee_config = make_ee_config(use_token=False, generate_cert=False) - ensemble = TestEnsemble(iter=1, reals=2, steps=1, jobs=2, id_="ee-0") + ensemble = TestEnsemble(_iter=1, reals=2, steps=1, jobs=2, id_="ee-0") ensemble.addFailJob(real=1, step=0, job=1) ee = EnsembleEvaluator( ensemble, @@ -253,7 +253,7 @@ def test_verify_monitor_failing_ensemble(make_ee_config, event_loop): @pytest.mark.consumer_driven_contract_verification def test_verify_monitor_failing_evaluation(make_ee_config, event_loop): ee_config = make_ee_config(use_token=False, generate_cert=False) - ensemble = TestEnsemble(iter=1, reals=2, steps=1, jobs=2, id_="ee-0") + ensemble = TestEnsemble(_iter=1, reals=2, steps=1, jobs=2, id_="ee-0") ensemble.with_failure() ee = EnsembleEvaluator( ensemble, @@ -268,7 +268,7 @@ def test_verify_monitor_failing_evaluation(make_ee_config, event_loop): @pytest.mark.consumer_driven_contract_verification def test_verify_monitor_successful_ensemble(make_ee_config, event_loop): - ensemble = TestEnsemble(iter=1, reals=2, steps=2, jobs=2, id_="ee-0").with_result( + ensemble = TestEnsemble(_iter=1, reals=2, steps=2, jobs=2, id_="ee-0").with_result( b"\x80\x04\x95\x0f\x00\x00\x00\x00\x00\x00\x00\x8c\x0bhello world\x94.", "application/octet-stream", ) @@ -309,7 +309,7 @@ def test_ens_eval_run_and_get_successful_realizations_connection_refused_no_reco ee_config = make_ee_config(use_token=False, generate_cert=False) ensemble = AutorunTestEnsemble( - iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" + _iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" ) for i in range(num_failing): ensemble.addFailJob(real=i, step=0, job=1) @@ -325,7 +325,7 @@ def test_ens_eval_run_and_get_successful_realizations_connection_refused_no_reco def test_ens_eval_run_and_get_successful_realizations_timeout(make_ee_config): ee_config = make_ee_config(use_token=False, generate_cert=False) - ensemble = AutorunTestEnsemble(iter=1, reals=1, steps=1, jobs=2, id_="0") + ensemble = AutorunTestEnsemble(_iter=1, reals=1, steps=1, jobs=2, id_="0") ee = EnsembleEvaluator(ensemble, ee_config, 0) with patch.object( @@ -361,7 +361,7 @@ def test_recover_from_failure_in_run_and_get_successful_realizations( use_token=False, generate_cert=False, custom_host="localhost" ) ensemble = AutorunTestEnsemble( - iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" + _iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" ) for i in range(num_failing): @@ -390,7 +390,7 @@ def test_exhaust_retries_in_run_and_get_successful_realizations( use_token=False, generate_cert=False, custom_host="localhost" ) ensemble = AutorunTestEnsemble( - iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" + _iter=1, reals=num_realizations, steps=1, jobs=2, id_="0" ) for i in range(num_failing): diff --git a/tests/ert_tests/ensemble_evaluator/test_monitor.py b/tests/ert_tests/ensemble_evaluator/test_monitor.py index ac8e47e68ea..c9dd477ba24 100644 --- a/tests/ert_tests/ensemble_evaluator/test_monitor.py +++ b/tests/ert_tests/ensemble_evaluator/test_monitor.py @@ -15,7 +15,7 @@ @pytest.mark.consumer_driven_contract_test def test_monitor_successful_ensemble(make_ee_config): - ensemble = TestEnsemble(iter=1, reals=2, steps=2, jobs=2, id_="0") + ensemble = TestEnsemble(_iter=1, reals=2, steps=2, jobs=2, id_="0") ensemble.addFailJob(real=1, step=0, job=1) ee_config = make_ee_config(use_token=False, generate_cert=False) ee = EnsembleEvaluator( @@ -42,7 +42,7 @@ def test_monitor_successful_ensemble(make_ee_config): @pytest.mark.consumer_driven_contract_test def test_monitor_failing_evaluation(make_ee_config): ee_config = make_ee_config(use_token=False, generate_cert=False) - ensemble = TestEnsemble(iter=1, reals=1, steps=1, jobs=1, id_="0") + ensemble = TestEnsemble(_iter=1, reals=1, steps=1, jobs=1, id_="0") ensemble.with_failure() ee = EnsembleEvaluator( ensemble, @@ -68,7 +68,7 @@ def test_monitor_failing_evaluation(make_ee_config): @pytest.mark.consumer_driven_contract_test def test_monitor_failing_ensemble(make_ee_config): - ensemble = TestEnsemble(iter=1, reals=2, steps=2, jobs=2, id_="0") + ensemble = TestEnsemble(_iter=1, reals=2, steps=2, jobs=2, id_="0") ensemble.addFailJob(real=1, step=0, job=1) ee_config = make_ee_config(use_token=False, generate_cert=False) ee = EnsembleEvaluator( diff --git a/tests/ert_tests/gui/simulation/view/test_realization.py b/tests/ert_tests/gui/simulation/view/test_realization.py index 0f127f4c9ba..d356941c80f 100644 --- a/tests/ert_tests/gui/simulation/view/test_realization.py +++ b/tests/ert_tests/gui/simulation/view/test_realization.py @@ -23,14 +23,14 @@ def sizeHint(self, option, index) -> QSize: @pytest.mark.requires_window_manager def test_delegate_drawing_count(small_snapshot, qtbot): - iter = 0 - widget = RealizationWidget(iter) + it = 0 + widget = RealizationWidget(it) qtbot.addWidget(widget) with qtbot.waitActive(widget, timeout=30000): model = SnapshotModel() - model._add_snapshot(SnapshotModel.prerender(small_snapshot), iter) + model._add_snapshot(SnapshotModel.prerender(small_snapshot), it) widget.setSnapshotModel(model) @@ -52,13 +52,13 @@ def test_delegate_drawing_count(small_snapshot, qtbot): @pytest.mark.requires_window_manager def test_selection_success(large_snapshot, qtbot): - iter = 0 - widget = RealizationWidget(iter) + it = 0 + widget = RealizationWidget(it) qtbot.addWidget(widget) model = SnapshotModel() - model._add_snapshot(SnapshotModel.prerender(large_snapshot), iter) + model._add_snapshot(SnapshotModel.prerender(large_snapshot), it) widget.setSnapshotModel(model) diff --git a/tests/ert_tests/services/test_base_service.py b/tests/ert_tests/services/test_base_service.py index 50b2a61b0a6..593662df453 100644 --- a/tests/ert_tests/services/test_base_service.py +++ b/tests/ert_tests/services/test_base_service.py @@ -38,7 +38,7 @@ def join(self): def server_script(monkeypatch, tmp_path: Path, request): marker = request.node.get_closest_marker("script") if marker is None: - return + return None monkeypatch.chdir(tmp_path) diff --git a/tests/libres_tests/res/enkf/test_enkf_main.py b/tests/libres_tests/res/enkf/test_enkf_main.py index 98d4c34015d..a8cc73ed054 100644 --- a/tests/libres_tests/res/enkf/test_enkf_main.py +++ b/tests/libres_tests/res/enkf/test_enkf_main.py @@ -204,7 +204,9 @@ def test_site_bootstrap(): def test_invalid_res_config(): with pytest.raises(TypeError): - EnKFMain(res_config="This is not a ResConfig instance") + EnKFMain( + res_config="This is not a ResConfig instance" + ) # pylint: disable=unexpected-keyword-arg def test_invalid_parameter_count_2_res_config(): diff --git a/tests/libres_tests/res/util/test_subprocess.py b/tests/libres_tests/res/util/test_subprocess.py index eee7016eb48..983872d6d26 100644 --- a/tests/libres_tests/res/util/test_subprocess.py +++ b/tests/libres_tests/res/util/test_subprocess.py @@ -34,6 +34,8 @@ def _find_system_pipe_max_size(): p.kill() return len(p.stdout.read()) + return None + _maxBytes = _find_system_pipe_max_size() - 1