From 18e9eca56ab6acca86336fe763437a6f1edf08b5 Mon Sep 17 00:00:00 2001
From: Mateusz Poliwczak <mpoliwczak@splunk.com>
Date: Mon, 25 Aug 2025 13:26:25 +0200
Subject: [PATCH] Remove duplicated modular input kind tests

This change removes two occurrences of the same test and consolidates
it into test_modular_input_kinds.py
---
 tests/integration/test_input.py               | 14 -----
 tests/integration/test_modular_input.py       | 56 -------------------
 tests/integration/test_modular_input_kinds.py |  7 +++
 3 files changed, 7 insertions(+), 70 deletions(-)
 delete mode 100755 tests/integration/test_modular_input.py

diff --git a/tests/integration/test_input.py b/tests/integration/test_input.py
index fe0ca83fc..ad5027218 100755
--- a/tests/integration/test_input.py
+++ b/tests/integration/test_input.py
@@ -231,20 +231,6 @@ def test_list(self):
         for input in input_list:
             self.assertTrue(input.name is not None)
 
-    @pytest.mark.app
-    def test_lists_modular_inputs(self):
-        # Install modular inputs to list, and restart
-        # so they'll show up.
-        self.install_app_from_collection("modular_inputs")
-        self.uncheckedRestartSplunk()
-
-        inputs = self.service.inputs
-        if ("abcd", "test2") not in inputs:
-            inputs.create("abcd", "test2", field1="boris")
-
-        input = inputs["abcd", "test2"]
-        self.assertEqual(input.field1, "boris")
-
     def test_create(self):
         inputs = self.service.inputs
         for entity in self._test_entities.values():
diff --git a/tests/integration/test_modular_input.py b/tests/integration/test_modular_input.py
deleted file mode 100755
index 5e92359b7..000000000
--- a/tests/integration/test_modular_input.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright © 2011-2024 Splunk, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"): you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import pytest
-from tests import testlib
-
-
-@pytest.mark.smoke
-class ModularInputKindTestCase(testlib.SDKTestCase):
-    def setUp(self):
-        super().setUp()
-        self.uncheckedRestartSplunk()
-
-    @pytest.mark.app
-    def test_lists_modular_inputs(self):
-        # Install modular inputs to list, and restart
-        # so they'll show up.
-        self.install_app_from_collection("modular_inputs")
-        self.uncheckedRestartSplunk()
-
-        inputs = self.service.inputs
-        if ("abcd", "test2") not in inputs:
-            inputs.create("abcd", "test2", field1="boris")
-
-        input = inputs["abcd", "test2"]
-        self.assertEqual(input.field1, "boris")
-        for m in self.service.modular_input_kinds:
-            self.check_modular_input_kind(m)
-
-    def check_modular_input_kind(self, m):
-        print(m.name)
-        if m.name == "test1":
-            self.assertEqual('Test "Input" - 1', m["title"])
-            self.assertEqual("xml", m["streaming_mode"])
-        elif m.name == "test2":
-            self.assertEqual("test2", m["title"])
-            self.assertEqual("simple", m["streaming_mode"])
-
-
-if __name__ == "__main__":
-    import unittest
-
-    unittest.main()
diff --git a/tests/integration/test_modular_input_kinds.py b/tests/integration/test_modular_input_kinds.py
index 5f33d2a08..4b7bc0022 100755
--- a/tests/integration/test_modular_input_kinds.py
+++ b/tests/integration/test_modular_input_kinds.py
@@ -81,6 +81,13 @@ def test_list_modular_inputs(self):
             # Not implemented before 5.0
             return
 
+        inputs = self.service.inputs
+        if ("abcd", "test2") not in inputs:
+            inputs.create("abcd", "test2", field1="boris")
+
+        input = inputs["abcd", "test2"]
+        self.assertEqual(input.field1, "boris")
+
         for m in self.service.modular_input_kinds:
             self.check_modular_input_kind(m)