From 09597561bcee99a9ebd7205efac2b4efdb71c406 Mon Sep 17 00:00:00 2001
From: "helmi.nour" <helmiinour@gmail.com>
Date: Wed, 24 May 2023 12:57:22 +0100
Subject: [PATCH 1/2] add mocked exec async test

---
 railib/api.py            |   2 +-
 test/multipart.data      | Bin 0 -> 1912 bytes
 test/test_integration.py |  39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 test/multipart.data

diff --git a/railib/api.py b/railib/api.py
index 8e28b72..22243ca 100644
--- a/railib/api.py
+++ b/railib/api.py
@@ -270,7 +270,7 @@ def _parse_multipart_form(
             txn_file.name = name.group(1).decode()
         filename = re.match(b'.*filename="(.+?)"', disposition)
         if not (filename is None):
-            txn_file.filename = name.group(1).decode()
+            txn_file.filename = filename.group(1).decode()
 
         result.append(txn_file)
 
diff --git a/test/multipart.data b/test/multipart.data
new file mode 100644
index 0000000000000000000000000000000000000000..4bd88bc6f95a8d6f68525bcdbc74779eceda099e
GIT binary patch
literal 1912
zcmb_c&2G~`5Z*L_nk7b2R8T57M0?`Erg457SD;F550yX^skf@C*7imOCAP6Qp{Vo)
zc!C}|aNt3B1m362*t;rCm8wOVYIb&JKF@wLyD8_M<Fq%sQUpDx(~+_%2HkEm@Y=n8
zOZ0tzXw#i2R5Db2ca+9aI#Q!3bnC+?nead;u~iSnM80M!5n(EP%(AWea5R>AoLv<-
z{2EKQF5-AR@&y7nKBZA;Q=6W#QNUc*^JFmW_kF(E>JIqO4<z^7j?abXbXua>YxcYW
zd&Lq7M8Z^_APJ#PW->|fSeLaL%|-_hsS-+pzw`dx!P~vVy<K*0Q@*rbCsGOQ{r-&}
zodNrC*8Dzpyx~Su6;IX1eyDn#n=AC9U}`CIkC=u+C<8CF$LGh(Y&K3JZ!9P2e>A&P
z9%kqbAf%#eZ01t8y|`1JeeO-+VcV3xp>4Wu71>i-vI><-)uxZF%J;&<{8qBy%FVU9
z+H8m<iM}jz&gNZkKbnT>T7P%^4Veljc?GxbEcMl2qofCLE3;V`G(;@?k20TDBUOnM
z6CC^{h*cn@LQp6vgIc5nYaT1W-hw}pSzL4d2{r)jX#X43!5Vp;6|x3<lrhA?6t-bm
z0iD4IzZPIG=CN%;{w%=$p2xQE?6vItCz`L}Q-gEy^cR^WkS&9*W+(_<adQZPvX?cO
zhv8o)&tPALFG`?<{LnS>d=a9Q)UtZ{%rJfd`at8*;Pe*BOPw&*;EZqVfk|j<e3L(&
z%NyV1F^zZkFE5PU*N4$$f_I5h%uQAsx2B%K;h89pa--h|A?w;VI7|D_wcXbCTw8<7
Z-xnbtbe!nKXH5w24^wyfhrqc_{{ki|nzjG{

literal 0
HcmV?d00001

diff --git a/test/test_integration.py b/test/test_integration.py
index 6a0270e..194a89e 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -7,7 +7,7 @@
 from logging.config import fileConfig
 from pathlib import Path
 from railib import api, config
-
+from unittest.mock import patch, MagicMock
 
 # Get creds from env vars if exists
 client_id = os.getenv("CLIENT_ID")
@@ -78,6 +78,43 @@ def test_v2_exec(self):
                     1, 8, 27, 64, 125], 'v4': [
                         1, 16, 81, 256, 625]}, rsp.results[0]["table"].to_pydict())
 
+    @patch('railib.rest.request')
+    def test_v2_exec_mocked(self, mock_urlopen):
+        # mock the multipart response
+        mocked_resp = MagicMock()
+        mocked_resp.headers.get.return_value = "multipart/form-data; boundary=b11385ead6144ee0a9550db3672a7ccf"
+        with open(os.path.join(Path(__file__).parent, "multipart.data"), "rb") as f:
+            mocked_resp.read.return_value = f.read()
+
+        mock_urlopen.return_value = mocked_resp
+
+        # run the current test
+        cmd = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}"
+        rsp = api.exec_async(ctx, dbname, engine, cmd)
+
+        # transaction
+        self.assertEqual("COMPLETED", rsp.transaction["state"])
+
+        # metadata
+        with open(os.path.join(Path(__file__).parent, "metadata.pb"), "rb") as f:
+            data = f.read()
+            self.assertEqual(
+                rsp.metadata,
+                api._parse_metadata_proto(data)
+            )
+
+        # problems
+        self.assertEqual(0, len(rsp.problems))
+
+        # results
+        self.assertEqual(
+            {
+                'v1': [
+                    1, 2, 3, 4, 5], 'v2': [
+                    1, 4, 9, 16, 25], 'v3': [
+                    1, 8, 27, 64, 125], 'v4': [
+                        1, 16, 81, 256, 625]}, rsp.results[0]["table"].to_pydict())
+
     def tearDown(self):
         api.delete_engine(ctx, engine)
         api.delete_database(ctx, dbname)

From b593c50e8d8decdf392727504a9e08e0e9ae1d6a Mon Sep 17 00:00:00 2001
From: "helmi.nour" <helmiinour@gmail.com>
Date: Wed, 24 May 2023 13:21:16 +0100
Subject: [PATCH 2/2] update db & engine

---
 test/test_integration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_integration.py b/test/test_integration.py
index 194a89e..a5def69 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -90,7 +90,7 @@ def test_v2_exec_mocked(self, mock_urlopen):
 
         # run the current test
         cmd = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}"
-        rsp = api.exec_async(ctx, dbname, engine, cmd)
+        rsp = api.exec_async(ctx, "mocked_db", "mocked_engine", cmd)
 
         # transaction
         self.assertEqual("COMPLETED", rsp.transaction["state"])