Merge pull request #399 from opencybersecurityalliance/test_without_i…

…nstall Change test_stixshifter_diagnosis to use bin dir instead of system PATH
opencybersecurityalliance · Sep 12, 2023 · c4e4749 · c4e4749
2 parents 07adff1 + 5673b04
commit c4e4749
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/bin/stix-shifter-diag b/bin/stix-shifter-diag
diff --git a/tests/test_stixshifter_diagnosis.py b/tests/test_stixshifter_diagnosis.py
@@ -1,10 +1,15 @@
-import pytest
+import os
 import subprocess
+import pytest
 
 from kestrel_datasource_stixshifter.diagnosis import Diagnosis
 from .utils import stixshifter_profile_lab101, stixshifter_profile_ecs
 
 
+cwd = os.path.dirname(os.path.abspath(__file__))
+STIX_SHIFTER_DIAG = os.path.join(cwd, "../bin/stix-shifter-diag")
+
+
 def test_diagnosis(stixshifter_profile_lab101):
     pattern = " ".join(
         [
@@ -74,7 +79,7 @@ def test_cli(stixshifter_profile_lab101):
 """
 
     result = subprocess.run(
-        args=["stix-shifter-diag", "lab101"],
+        args=[STIX_SHIFTER_DIAG, "lab101"],
         universal_newlines=True,
         stdout=subprocess.PIPE,
     )
@@ -128,7 +133,7 @@ def test_cli_ecs(stixshifter_profile_ecs):
 
     result = subprocess.run(
         args=[
-            "stix-shifter-diag",
+            STIX_SHIFTER_DIAG,
             "-p",
             "[x-oca-asset:device_id = '123456'] START t'2000-01-01T00:00:00.000Z' STOP t'3000-01-01T00:00:00.000Z'",
             "-t",