Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdk-notebook: remove rest_api from tests #2336

Merged
merged 1 commit into from
Jun 28, 2023
Merged

vdk-notebook: remove rest_api from tests #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/jobs/rest-api-job-code-error/config.ini → ...sts/jobs/ingest-job-code-error/config.ini
View file
Open in desktop
File renamed without changes.
0 .../rest-api-job-code-error/requirements.txt → ...bs/ingest-job-code-error/requirements.txt
View file
Open in desktop
File renamed without changes.
40 changes: 10 additions & 30 deletions .../jobs/rest-api-job-code-error/steps.ipynb → ...ts/jobs/ingest-job-code-error/steps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"id": "c635d290-99d5-4354-b95c-a3210e4cf6e1",
"metadata": {
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"import requests"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -49,11 +35,19 @@
"metadata": {
"tags": [
"vdk"
]
],
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"response = requests.get(\"https://jsonplaceholder.typicode.com/todos/1\")"
"payload = {\n",
" \"userId\": 1,\n",
" \"id\": 1,\n",
" \"title\": \"delectus aut autem\",\n",
" \"completed\": False\n",
" }"
]
},
{
Expand All @@ -71,20 +65,6 @@
"hello1 = hello + 1"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "f04c82ad-b8df-484e-9903-e064d61ca5c5",
"metadata": {
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"payload = response.json()"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down
0 ...book/tests/jobs/mixed-rest-api/config.ini → ...s/ingest-job-fail-syntax-error/config.ini
View file
Open in desktop
File renamed without changes.
0 ...pi-job-fail-syntax-error/requirements.txt → ...st-job-fail-syntax-error/requirements.txt
View file
Open in desktop
File renamed without changes.
26 changes: 10 additions & 16 deletions ...est-api-job-fail-syntax-error/steps.ipynb → .../ingest-job-fail-syntax-error/steps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,22 @@
"metadata": {
"tags": [
"vdk"
]
],
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"response = requests.get(\"https://jsonplaceholder.typicode.com/todos/1\")\n",
"payload = {\n",
" \"userId\": 1,\n",
" \"id\": 1,\n",
" \"title\": \"delectus aut autem\",\n",
" \"completed\": False\n",
" }\n",
"ss"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "211b1800-6699-49c0-83bc-fe6d9878adcf",
"metadata": {
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"payload = response.json()"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down
0 ...rest-api-job-fail-syntax-error/config.ini → ...ests/jobs/ingest-job-sql-error/config.ini
View file
Open in desktop
File renamed without changes.
0 ...ests/jobs/mixed-rest-api/requirements.txt → ...obs/ingest-job-sql-error/requirements.txt
View file
Open in desktop
File renamed without changes.
48 changes: 14 additions & 34 deletions ...s/jobs/rest-api-job-sql-error/steps.ipynb → ...sts/jobs/ingest-job-sql-error/steps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"id": "c635d290-99d5-4354-b95c-a3210e4cf6e1",
"metadata": {
"pycharm": {
"name": "#%%\n"
},
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"import requests"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -58,25 +41,19 @@
"metadata": {
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"response = requests.get(\"https://jsonplaceholder.typicode.com/todos/1\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "654db028-2d0e-4f95-a377-e1fac1255f08",
"metadata": {
"tags": [
"vdk"
]
],
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"payload = response.json()"
"payload = {\n",
" \"userId\": 1,\n",
" \"id\": 1,\n",
" \"title\": \"delectus aut autem\",\n",
" \"completed\": False\n",
" }"
]
},
{
Expand All @@ -86,7 +63,10 @@
"metadata": {
"tags": [
"vdk"
]
],
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
Expand Down
0 ...ts/jobs/rest-api-job-sql-error/config.ini → ...notebook/tests/jobs/ingest-job/config.ini
View file
Open in desktop
File renamed without changes.
0 ...s/rest-api-job-sql-error/requirements.txt → ...ok/tests/jobs/ingest-job/requirements.txt
View file
Open in desktop
File renamed without changes.
26 changes: 10 additions & 16 deletions ...ebook/tests/jobs/rest-api-job/steps.ipynb → ...otebook/tests/jobs/ingest-job/steps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,26 @@
"job_input.execute_query(\"CREATE TABLE rest_target_table (userId, id, title, completed);\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "40c5181f-7a29-4842-b3f4-d1258522c83c",
"metadata": {
"tags": [
"vdk"
]
},
"outputs": [],
"source": [
"response = requests.get(\"https://jsonplaceholder.typicode.com/todos/1\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "654db028-2d0e-4f95-a377-e1fac1255f08",
"metadata": {
"tags": [
"vdk"
]
],
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"payload = response.json()"
"payload = {\n",
" \"userId\": 1,\n",
" \"id\": 1,\n",
" \"title\": \"delectus aut autem\",\n",
" \"completed\": False\n",
" }"
]
},
{
Expand Down
0 ...s/jobs/mixed-rest-api/10_delete_table.sql → .../tests/jobs/mixed-job/10_delete_table.sql
View file
Open in desktop
File renamed without changes.
0 ...jobs/mixed-rest-api/20_create_table.ipynb → ...ests/jobs/mixed-job/20_create_table.ipynb
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions ...sts/jobs/mixed-rest-api/30_rest_ingest.py → ...otebook/tests/jobs/mixed-job/30_ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# Copyright 2021-2023 VMware, Inc.
# SPDX-License-Identifier: Apache-2.0
import requests


def run(job_input):
response = requests.get("https://jsonplaceholder.typicode.com/todos/1")
response.raise_for_status()
payload = response.json()
payload = {"userId": 1, "id": 1, "title": "delectus aut autem", "completed": False}

job_input.send_object_for_ingestion(
payload=payload, destination_table="rest_target_table"
Expand Down
0 ...tebook/tests/jobs/rest-api-job/config.ini → ...-notebook/tests/jobs/mixed-job/config.ini
View file
Open in desktop
File renamed without changes.
0 .../tests/jobs/rest-api-job/requirements.txt → ...ook/tests/jobs/mixed-job/requirements.txt
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions projects/vdk-plugins/vdk-notebook/tests/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def setUp(self) -> None:

def test_successful_job(self) -> None:
result: Result = self.__runner.invoke(
["run", jobs_path_from_caller_directory("rest-api-job")]
["run", jobs_path_from_caller_directory("ingest-job")]
)
cli_assert_equal(0, result)
actual_rs: Result = self.__runner.invoke(
Expand All @@ -39,25 +39,25 @@ def test_successful_job(self) -> None:

def test_failing_job_with_syntax_error(self) -> None:
result: Result = self.__runner.invoke(
["run", jobs_path_from_caller_directory("rest-api-job-fail-syntax-error")]
["run", jobs_path_from_caller_directory("ingest-job-fail-syntax-error")]
)
cli_assert_equal(1, result)

def test_failing_job_with_code_error(self) -> None:
result: Result = self.__runner.invoke(
["run", jobs_path_from_caller_directory("rest-api-job-fail-code-error")]
["run", jobs_path_from_caller_directory("ingest-job-fail-code-error")]
)
cli_assert_equal(2, result)

def test_failing_job_with_sql_error(self) -> None:
result: Result = self.__runner.invoke(
["run", jobs_path_from_caller_directory("rest-api-job-sql-error")]
["run", jobs_path_from_caller_directory("ingest-job-sql-error")]
)
cli_assert_equal(1, result)

def test_mixed_job_with_py_and_sql(self) -> None:
result: Result = self.__runner.invoke(
["run", jobs_path_from_caller_directory("mixed-rest-api")]
["run", jobs_path_from_caller_directory("mixed-job")]
)
cli_assert_equal(0, result)
actual_rs: Result = self.__runner.invoke(
Expand Down