Model correction

.github/workflows/runtest.yml

@@ -0,0 +1,36 @@
+name: Python Tests
+
+on:
+  push:   
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.10.18]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+          pip install py
+          pip install -r requirements.txt
+
+      - name: Integration Tests
+        env:
+          GRIDAPPSD_USER: ${{ secrets.GRIDAPPSD_USER }}
+          GRIDAPPSD_PASSWORD: ${{ secrets.GRIDAPPSD_PASSWORD }}
+        run: |
+          pytest -rA --html=out/${{ env.RESULTS }} --self-contained-html --timeout=2700  

README

@@ -20,3 +20,5 @@ export GRIDAPPSD_PASSWORD=<password>
 
 # run pytest
 pytest -s
+
+#(If you need to run the pytest command using sudo make sure to include the -E flag to include environment variables)

assumptions.py

@@ -275,12 +275,12 @@ def get_switch_mrids(gridappsd_obj, mrid):
     SELECT ?name ?basev ?bus1 ?bus2 ?open ?fdrid ?continuous ?breaking (group_concat(distinct ?phs;separator="\n") as ?phases) WHERE {
      ?s r:type c:LoadBreakSwitch.
     # feeder selection options - if all commented out, query matches all feeders
-    #VALUES ?fdrid {"_C1C3E687-6FFD-C753-582B-632A27E28507"}  # 123 bus
-    #VALUES ?fdrid {"_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62"}  # 13 bus
-    #VALUES ?fdrid {"_5B816B93-7A5F-B64C-8460-47C17D6E4B0F"}  # 13 bus assets
-    VALUES ?fdrid {"_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3"}  # 8500 node
-    #VALUES ?fdrid {"_67AB291F-DCCD-31B7-B499-338206B9828F"}  # J1
-    #VALUES ?fdrid {"_9CE150A8-8CC5-A0F9-B67E-BBD8C79D3095"}  # R2 12.47 3
+    #VALUES ?fdrid {"C1C3E687-6FFD-C753-582B-632A27E28507"}  # 123 bus
+    #VALUES ?fdrid {"49AD8E07-3BF9-A4E2-CB8F-C3722F837B62"}  # 13 bus
+    #VALUES ?fdrid {"5B816B93-7A5F-B64C-8460-47C17D6E4B0F"}  # 13 bus assets
+    VALUES ?fdrid {"4F76A5F9-271D-9EB8-5E31-AA362D86F2C3"}  # 8500 node
+    #VALUES ?fdrid {"67AB291F-DCCD-31B7-B499-338206B9828F"}  # J1
+    #VALUES ?fdrid {"9CE150A8-8CC5-A0F9-B67E-BBD8C79D3095"}  # R2 12.47 3
      ?s c:Equipment.EquipmentContainer ?fdr.
      ?fdr c:IdentifiedObject.mRID ?fdrid.
      ?s c:IdentifiedObject.name ?name.

conftest.py

@@ -9,7 +9,7 @@
 import pytest
 
 from gridappsd import GridAPPSD, GOSS
-from gridappsd.docker_handler import run_dependency_containers, run_gridappsd_container, Containers
+from docker_handler import run_dependency_containers, run_gridappsd_container, Containers
 
 levels = dict(
     CRITICAL=50,
@@ -42,17 +42,17 @@
 STOP_CONTAINER_AFTER_TEST = os.environ.get('GRIDAPPSD_STOP_CONTAINERS_AFTER_TESTS', True)
 
 
+
 @pytest.fixture(scope="module")
 def docker_dependencies():
-    print("Docker dependencies")
     # Containers.reset_all_containers()
 
     with run_dependency_containers(stop_after=STOP_CONTAINER_AFTER_TEST) as dep:
         yield dep
-    print("Cleanup docker dependencies")
 
 @pytest.fixture
 def gridappsd_client(request, docker_dependencies):
+
     with run_gridappsd_container(stop_after=STOP_CONTAINER_AFTER_TEST):
         gappsd = GridAPPSD()
         gappsd.connect()
@@ -62,7 +62,6 @@ def gridappsd_client(request, docker_dependencies):
         if request.cls is not None:
             request.cls.gridappsd_client = gappsd
         yield gappsd
-
         gappsd.disconnect()
 
 @pytest.fixture
@@ -154,3 +153,4 @@ def pytest_runtest_makereport(item, call):
     outcome = yield
     report = outcome.get_result()
     report.description = str(item.function.__doc__)
+