diff --git a/docker-compose.yml b/docker-compose.yml index c29a3397..a82d16a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,8 +23,8 @@ services: - "./tests/system/test_apps/reporting_app:/opt/splunk/etc/apps/reporting_app" - "./tests/system/test_apps/streaming_app:/opt/splunk/etc/apps/streaming_app" - "./tests/system/test_apps/modularinput_app:/opt/splunk/etc/apps/modularinput_app" - - "./splunklib:/opt/splunk/etc/apps/eventing_app/lib/splunklib" - - "./splunklib:/opt/splunk/etc/apps/generating_app/lib/splunklib" - - "./splunklib:/opt/splunk/etc/apps/reporting_app/lib/splunklib" - - "./splunklib:/opt/splunk/etc/apps/streaming_app/lib/splunklib" - - "./splunklib:/opt/splunk/etc/apps/modularinput_app/lib/splunklib" + - "./splunklib:/opt/splunk/etc/apps/eventing_app/bin/splunklib" + - "./splunklib:/opt/splunk/etc/apps/generating_app/bin/splunklib" + - "./splunklib:/opt/splunk/etc/apps/reporting_app/bin/splunklib" + - "./splunklib:/opt/splunk/etc/apps/streaming_app/bin/splunklib" + - "./splunklib:/opt/splunk/etc/apps/modularinput_app/bin/splunklib" diff --git a/tests/system/test_apps/eventing_app/bin/eventingcsc.py b/tests/system/test_apps/eventing_app/bin/eventingcsc.py index 9f43d258..c162195f 100644 --- a/tests/system/test_apps/eventing_app/bin/eventingcsc.py +++ b/tests/system/test_apps/eventing_app/bin/eventingcsc.py @@ -15,15 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import os, sys +import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "lib")) from splunklib.searchcommands import ( - dispatch, - EventingCommand, Configuration, + EventingCommand, Option, - validators, + dispatch, ) diff --git a/tests/system/test_apps/generating_app/bin/generatingcsc.py b/tests/system/test_apps/generating_app/bin/generatingcsc.py index 42d5aff7..dd69ad24 100644 --- a/tests/system/test_apps/generating_app/bin/generatingcsc.py +++ b/tests/system/test_apps/generating_app/bin/generatingcsc.py @@ -15,15 +15,14 @@ # License for the specific language governing permissions and limitations # under the License. -import os, sys +import sys import time -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "lib")) from splunklib.searchcommands import ( - dispatch, - GeneratingCommand, Configuration, + GeneratingCommand, Option, + dispatch, validators, ) diff --git a/tests/system/test_apps/modularinput_app/bin/modularinput.py b/tests/system/test_apps/modularinput_app/bin/modularinput.py index 838b2cf4..755d92d3 100755 --- a/tests/system/test_apps/modularinput_app/bin/modularinput.py +++ b/tests/system/test_apps/modularinput_app/bin/modularinput.py @@ -15,11 +15,9 @@ # under the License. import sys -import os from urllib import parse -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "lib")) -from splunklib.modularinput import Scheme, Argument, Script, Event +from splunklib.modularinput import Argument, Event, Scheme, Script class ModularInput(Script): diff --git a/tests/system/test_apps/reporting_app/bin/reportingcsc.py b/tests/system/test_apps/reporting_app/bin/reportingcsc.py index 145df1b1..3a990711 100644 --- a/tests/system/test_apps/reporting_app/bin/reportingcsc.py +++ b/tests/system/test_apps/reporting_app/bin/reportingcsc.py @@ -15,14 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import os, sys +import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "lib")) from splunklib.searchcommands import ( - dispatch, - ReportingCommand, Configuration, Option, + ReportingCommand, + dispatch, validators, ) diff --git a/tests/system/test_apps/streaming_app/bin/streamingcsc.py b/tests/system/test_apps/streaming_app/bin/streamingcsc.py index aa92cd45..d3b3ea18 100644 --- a/tests/system/test_apps/streaming_app/bin/streamingcsc.py +++ b/tests/system/test_apps/streaming_app/bin/streamingcsc.py @@ -15,15 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. -import os, sys +import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "lib")) from splunklib.searchcommands import ( - dispatch, - StreamingCommand, Configuration, - Option, - validators, + StreamingCommand, + dispatch, )