fix: Implemented detailed retry error code logic

zscaler · Apr 9, 2024 · 59e7d29 · 59e7d29
1 parent bdd3a2a
commit 59e7d29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/zia-test.yml b/.github/workflows/zia-test.yml
@@ -50,7 +50,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zia
+                  make coverage:zia 
               env:
                 ZIA_USERNAME: ${{ secrets.ZIA_USERNAME }}
                 ZIA_PASSWORD: ${{ secrets.ZIA_PASSWORD }}
@@ -103,7 +103,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zia
+                  make coverage:zia
               env:
                 ZIA_USERNAME: ${{ secrets.ZIA_USERNAME }}
                 ZIA_PASSWORD: ${{ secrets.ZIA_PASSWORD }}
@@ -114,3 +114,5 @@ jobs:
                 ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
                 ZPA_CUSTOMER_ID: ${{ secrets.ZPA_CUSTOMER_ID }}
                 ZPA_CLOUD: ${{ secrets.ZPA_CLOUD }}
+        needs:
+          - zia-beta-tenants
diff --git a/.github/workflows/zpa_test.yml b/.github/workflows/zpa_test.yml
@@ -51,7 +51,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zpa
+                    make coverage:zpa
               env:
                 ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
                 ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
@@ -98,7 +98,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zpa
+                    make coverage:zpa
               env:
                 ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
                 ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
@@ -145,7 +145,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zpa
+                    make coverage:zpa
               env:
                 ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
                 ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
@@ -195,7 +195,7 @@ jobs:
                 max_attempts: 3
                 timeout_minutes: 20
                 command: |
-                    make test:integration:zpa
+                    make coverage:zpa
               env:
                 ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
                 ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}

diff --git a/tests/integration/zia/test_users.py b/tests/integration/zia/test_users.py
@@ -66,7 +66,7 @@ async def test_users(self, fs):
 
             # Activate Configuration
             activation_response = client.activate.activate()
-            assert activation_response in ["ACTIVE", "PENDING"], "Activation failed or is pending"
+            assert activation_response in ["ACTIVE", "INPROGRESS", "PENDING"], "Activation failed or is pending"
         except Exception as exc:
             errors.append(f"User creation or activation failed: {exc}")
 
@@ -131,7 +131,7 @@ async def test_users(self, fs):
 
                     # Reactivate Configuration after Deletion
                     activation_response = client.activate.activate()
-                    assert activation_response in ["ACTIVE", "PENDING"], "Activation failed or is pending after deletion"
+                    assert activation_response in ["ACTIVE", "INPROGRESS", "PENDING"], "Activation failed or is pending after deletion"
                 except Exception as exc:
                     errors.append(f"Deleting User Account or reactivation failed: {exc}")