From de5003d5a8458baaa48e8daddefa77befcc68793 Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Tue, 22 Aug 2023 10:56:44 +0200 Subject: [PATCH 1/2] fix nits causing build failure --- tools/src/test/python/test_readconfig.py | 4 ++-- tools/src/test/python/test_restful.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/src/test/python/test_readconfig.py b/tools/src/test/python/test_readconfig.py index bb89021151c..84c45aeaabf 100644 --- a/tools/src/test/python/test_readconfig.py +++ b/tools/src/test/python/test_readconfig.py @@ -20,7 +20,7 @@ # # -# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. # import os import tempfile @@ -37,5 +37,5 @@ def test_read_config_empty_yaml(): res = read_config(mock(spec=logging.Logger, strict=False), tmpf.name) os.remove(tmpf.name) assert res is not None - assert type(res) == dict + assert type(res) is dict assert len(res) == 0 diff --git a/tools/src/test/python/test_restful.py b/tools/src/test/python/test_restful.py index a69e234d790..9ff3fa11b0b 100644 --- a/tools/src/test/python/test_restful.py +++ b/tools/src/test/python/test_restful.py @@ -20,7 +20,7 @@ # # -# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. # import pytest @@ -30,7 +30,7 @@ from mockito import verify, patch, mock -from opengrok_tools.utils.restful import call_rest_api,\ +from opengrok_tools.utils.restful import call_rest_api, \ CONTENT_TYPE, APPLICATION_JSON, do_api_call from opengrok_tools.utils.commandsequence import ApiCall From 6798777fc3b133ac3f5afe9ef3f6963a21a62293 Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Tue, 22 Aug 2023 13:08:30 +0200 Subject: [PATCH 2/2] remove oldC check ctags --list-languages no longer contains it --- .../src/test/java/org/opengrok/indexer/util/CtagsUtilTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/util/CtagsUtilTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/util/CtagsUtilTest.java index 40d0441f35f..f2442d2d1e9 100644 --- a/opengrok-indexer/src/test/java/org/opengrok/indexer/util/CtagsUtilTest.java +++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/util/CtagsUtilTest.java @@ -48,8 +48,6 @@ void getLanguages() { assertNotNull(result, "getLanguages() should always return non null"); assertFalse(result.isEmpty(), "should get Ctags languages"); assertTrue(result.contains("C++"), "Ctags languages should contain C++"); - // Test that the [disabled] tag is stripped for OldC. - assertTrue(result.contains("OldC"), "Ctags languages should contain OldC"); } @Test