Skip to content
This repository was archived by the owner on Feb 3, 2021. It is now read-only.

Fix: set defaults for SparkConfiguration, add tests #606

Merged
jafreck merged 2 commits into from
Jun 15, 2018
Merged

Fix: set defaults for SparkConfiguration, add tests #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19a41f9
add SparkConfiguration tests
jafreck Jun 14, 2018
5f59603
change test directory structure
jafreck Jun 14, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install:

script:
- pylint -E aztk
- pytest --ignore=tests/spark/integration_tests
- pytest --ignore=tests/integration_tests

branches:
only:
Expand Down
6 changes: 3 additions & 3 deletions aztk/spark/models/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class File(aztk.models.File):


class SparkConfiguration(Model):
spark_defaults_conf = fields.String()
spark_env_sh = fields.String()
core_site_xml = fields.String()
spark_defaults_conf = fields.String(default=None)
spark_env_sh = fields.String(default=None)
core_site_xml = fields.String(default=None)
jars = fields.List()

def __init__(self, *args, **kwargs):
Expand Down
0 ...gration_tests/sdk/cluster/test_cluster.py → ...n_tests/spark/sdk/cluster/test_cluster.py
View file
Open in desktop
File renamed without changes.
0 ...ark/integration_tests/sdk/job/test_job.py → ...tegration_tests/spark/sdk/job/test_job.py
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions tests/spark/models/test_spark_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from aztk.spark.models import SparkConfiguration
from aztk.error import InvalidModelError


def test_spark_configuration_defaults():
spark_configuration = SparkConfiguration()
spark_configuration.validate()

assert spark_configuration.spark_defaults_conf is None
assert spark_configuration.spark_defaults_conf is None
assert spark_configuration.spark_defaults_conf is None

def test_spark_configuration_fields():
spark_configuration = SparkConfiguration(
spark_defaults_conf="spark-defaults.conf",
spark_env_sh="spark-env.sh",
core_site_xml="core-site.xml",
)
spark_configuration.validate()

assert spark_configuration.spark_defaults_conf == "spark-defaults.conf"
assert spark_configuration.spark_env_sh == "spark-env.sh"
assert spark_configuration.core_site_xml == "core-site.xml"