Merge pull request #43 from barrettj12/merge-3.2-3.3-20231017

Merge 3.2 into 3.3
juju · Oct 17, 2023 · f314139 · f314139
2 parents af8e6fb + 115dbb3
commit f314139
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,8 +6,29 @@ on:
 
 jobs:
 
+  unit-tests:
+    name: Unit tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+
+    - name: Install dependencies for testing
+      run: |
+        pip install -r requirements-dev.txt
+
+    - name: Run tests
+      run: |
+        ./run_tests
+
+
   build:
     name: Build charms
+    needs: unit-tests
     uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v4
     with:
       artifact-name: charm-packed

diff --git a/tests/test_charm.py b/tests/test_charm.py
@@ -42,6 +42,7 @@ def test_website_relation_joined(self, open, ingress_address):
         harness = Harness(JujuControllerCharm)
         self.addCleanup(harness.cleanup)
         harness.begin()
+        harness.set_leader()
         relation_id = harness.add_relation('website', 'haproxy')
         harness.add_relation_unit(relation_id, 'haproxy/0')