Merge pull request #671 from splunk/dev/CB/SDK-21-dependencies-in-bin

SDK-21 add deps of test apps into bin/

Author: cecyliaborek

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"

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,
 )
 
 

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,
 )
 

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):

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,
 )
 

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,
 )