test: Fix integration tests (#104)

firebolt-db · Sep 5, 2024 · ea883c4 · ea883c4
1 parent f63ca46
commit ea883c4
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Set up .NET 6.0
       id: dotnet-setup
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0
 

diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up .NET 6.0
       id: dotnet-setup
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0.x
 

diff --git a/.github/workflows/integration-tests-v1.yml b/.github/workflows/integration-tests-v1.yml
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up .NET 6.0
         id: dotnet-setup
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0
 

diff --git a/.github/workflows/integration-tests-v2.yml b/.github/workflows/integration-tests-v2.yml
@@ -50,11 +50,11 @@ jobs:
           fi
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up .NET 6.0
         id: dotnet-setup
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     needs: integration-tests
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.RELEASE_PAT }}
@@ -42,7 +42,7 @@ jobs:
         shell: bash
 
       - name: Checkout release action repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: firebolt-db/action-python-release
           path: release_action
@@ -77,7 +77,7 @@ jobs:
 
       - name: Set up .NET 6.0
         id: dotnet-setup
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0
 

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -14,11 +14,11 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Set up .NET 6.0
       id: dotnet-setup
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0
 

diff --git a/FireboltDotNetSdk.Tests/Integration/ConnectionTest.cs b/FireboltDotNetSdk.Tests/Integration/ConnectionTest.cs
@@ -273,7 +273,17 @@ private void SetConnectionStringFirstGoodThenWrong<E>(string connString1, string
             DbConnection connection = new FireboltConnection(connString1);
             connection.Open();
             assertSelect(connection.CreateCommand());
-            Assert.Throws<E>(() => connection.ConnectionString = connString2);
+            System.Exception? e = null;
+            try
+            {
+                connection.ConnectionString = connString2;
+            }
+            catch (System.Exception exception)
+            {
+                connection.Close();
+                e = exception;
+            }
+            Assert.That(e, Is.InstanceOf<E>());
         }
 
         private void assertSelect(DbCommand command)

diff --git a/FireboltDotNetSdk.Tests/Integration/SystemEngineTest.cs b/FireboltDotNetSdk.Tests/Integration/SystemEngineTest.cs
@@ -82,16 +82,21 @@ public void SelectUsingSystemEngineTest()
                 var command = CreateCommand("CREATE TABLE IF NOT EXISTS dummy(id INT)");
                 command.ExecuteNonQuery();
                 command = CreateCommand("SELECT * FROM dummy");
-                string errorMessage = ((FireboltException?)Assert.Throws(Is.InstanceOf<FireboltException>(), () => { command.ExecuteNonQuery(); }))?.Response ?? "";
-                Assert.True(new Regex("Run this (query|statement) on a user engine.").Match(errorMessage).Success);
-            }
-            finally
-            {
+                string errorMessage = "";
                 try
                 {
-                    CreateCommand("DROP TABLE dummy").ExecuteNonQuery();
+                    command.ExecuteNonQuery();
                 }
-                catch (FireboltException) { };
+                catch (FireboltException e)
+                {
+                    errorMessage = e.Message;
+                }
+                Assert.That(new Regex("Run this (query|statement) on a user engine.").Match(errorMessage).Success, Is.True);
+
+            }
+            finally
+            {
+                CreateCommand("DROP TABLE IF EXISTS dummy").ExecuteNonQuery();
             }
         }
 
@@ -337,10 +342,6 @@ public void ConnectToAccountWithoutUser()
 
                 string clientId = reader.GetString(1);
                 string clientSecret = reader.GetString(2);
-                if (string.IsNullOrEmpty(clientId)) // Currently this is bugged so retrieve id via a query. FIR-28719
-                {
-                    clientId = (string)CreateCommand($"SELECT service_account_id FROM information_schema.service_accounts WHERE service_account_name='{sa_account_name}'").ExecuteScalar()!;
-                }
                 string connectionString = ConnectionString(new Tuple<string, string?>[]
                 {
                     Tuple.Create<string, string?>(nameof(ClientId), clientId),