From 8dc44e6d05d6eec78caf58b75cb51a496a8af22d Mon Sep 17 00:00:00 2001 From: Butch Wesley Date: Sun, 23 Sep 2018 14:30:48 -0400 Subject: [PATCH] caught in self-code review --- addons/gut/gut_cmdln.gd | 3 +-- addons/gut/summary.gd | 4 +--- test/parsing_and_loading_samples/test_samples.gd | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/gut/gut_cmdln.gd b/addons/gut/gut_cmdln.gd index 941561e9..3b82ef7d 100644 --- a/addons/gut/gut_cmdln.gd +++ b/addons/gut/gut_cmdln.gd @@ -405,7 +405,6 @@ func load_options_from_config_file(file_path, into): into.log_level = get_value(results.result, 'log', 1) into.inner_class = get_value(results.result, 'inner_class', '') into.opacity = get_value(results.result, 'opacity', 100) - #into.include_subdirs = get_value(results.result, 'include_subdirs', false) return 1 @@ -483,7 +482,7 @@ func _init(): else: load_auto_load_scripts() apply_options(opt_resolver.get_resolved_values()) - + if(_auto_run): _tester.test_scripts(!_run_single) diff --git a/addons/gut/summary.gd b/addons/gut/summary.gd index 7bac73ef..86402b7d 100644 --- a/addons/gut/summary.gd +++ b/addons/gut/summary.gd @@ -117,10 +117,8 @@ func get_totals(): totals.pending += _scripts[s].get_pending_count() totals.failing += _scripts[s].get_fail_count() totals.tests += _scripts[s]._test_order.size() - if(_scripts[s].name.find('.gd.') == -1): - totals.scripts += 1 - #totals.scripts = _scripts.size() + totals.scripts = get_non_inner_class_script_count() return totals diff --git a/test/parsing_and_loading_samples/test_samples.gd b/test/parsing_and_loading_samples/test_samples.gd index 4c5077d6..e6aeecf4 100644 --- a/test/parsing_and_loading_samples/test_samples.gd +++ b/test/parsing_and_loading_samples/test_samples.gd @@ -14,7 +14,7 @@ extends "res://addons/gut/test.gd" func before_each(): gut.p("ran setup", 2) -func after_all(): +func after_each(): gut.p("ran teardown", 2) func before_all():