Skip to content

Allow version mismatch in test #51

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

Merged
merged 5 commits into from
Apr 5, 2019
Merged

Allow version mismatch in test #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaa5806
Allow version mismatch in integration test
vishalbollu Apr 5, 2019
c9ea838
Remove unnecessary variable rename
vishalbollu Apr 5, 2019
02e13c8
Move cortex config version update to iris_context file
vishalbollu Apr 5, 2019
e3ee1ff
Fix linting in iris_context.py
vishalbollu Apr 5, 2019
3053982
Rename get_raw_ctx to get
vishalbollu Apr 5, 2019
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
12 changes: 10 additions & 2 deletions pkg/workloads/spark_job/test/integration/iris_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import consts

"""
HOW TO GENERATE CONTEXT

Expand All @@ -25,10 +27,16 @@
from lib.storage import S3
bucket, key = S3.deconstruct_s3_path('s3://<cortex-bucket>/apps/<app-name>/contexts/<context-id>.msgpack')
S3(bucket, client_config={}).get_msgpack(key)

5. Modify environment_data.csv_data.path to point to the correct input data file
"""


def get(input_data_path):
raw_ctx["environment_data"]["csv_data"]["path"] = input_data_path
raw_ctx["cortex_config"]["api_version"] = consts.CORTEX_VERSION

return raw_ctx


raw_ctx = {
"raw_dataset": {
"key": "apps/iris/data/2019-03-08-09-58-35-701834/3976c5679bcf7cb550453802f4c3a9333c5f193f6097f1f5642de48d2397554/data_raw/raw.parquet",
Expand Down
10 changes: 5 additions & 5 deletions pkg/workloads/spark_job/test/integration/iris_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from spark_job import spark_job
from lib.exceptions import UserException
from lib import Context
from test.integration.iris_context import raw_ctx
from test.integration import iris_context

import pytest
from pyspark.sql.types import *
Expand Down Expand Up @@ -54,6 +54,10 @@ def test_simple_end_to_end(spark):
local_storage_path = Path("/workspace/local_storage")
local_storage_path.mkdir(parents=True, exist_ok=True)
should_ingest = True
input_data_path = os.path.join(str(local_storage_path), "iris.csv")

raw_ctx = iris_context.get(input_data_path)

workload_id = raw_ctx["raw_columns"]["raw_float_columns"]["sepal_length"]["workload_id"]

cols_to_validate = []
Expand All @@ -65,10 +69,6 @@ def test_simple_end_to_end(spark):
iris_data_string = "\n".join(",".join(str(val) for val in line) for line in iris_data)
Path(os.path.join(str(local_storage_path), "iris.csv")).write_text(iris_data_string)

raw_ctx["environment_data"]["csv_data"]["path"] = os.path.join(
str(local_storage_path), "iris.csv"
)

ctx = Context(
raw_obj=raw_ctx, cache_dir="/workspace/cache", local_storage_path=str(local_storage_path)
)
Expand Down