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.

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

Generic javascript template support [WIP] #8

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

EntilZha
Copy link
Member

First, this is a WIP, but want to get feedback early on the overall design/implementation. Eventually I hope to get everything implemented that is in #7.

Initially, I have added the django models, tests to make sure they work correctly, and a test script with modifications to the docker entrypoint to run these tests. Tests pass at the moment.

I will make an issue, but I think since we now are adding tests, we should have tests being run on at least PRs. Travis CI would be nice, but I don't think would play with docker, so that leaves Jenkins. At Trulia I have a Jenkins server setup that builds with docker, I could set something similar up if there was a machine I could use (perhaps from AMPLab?).

@thisisdhaas
Copy link
Member

We have a Jenkins setup in place at the lab. I'll look in to getting this project running on it.

@@ -28,6 +28,13 @@ def __unicode__(self):
class Meta:
abstract = True

@staticmethod
def to_json(task_group):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these methods aren't actually outputting JSON. Either have the method return json.dumps(return_dict), or rename it to_dict().

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, the json_view decorator can automatically convert the dict so will do to_dict

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@thisisdhaas
Copy link
Member

ok to test

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ampcrowd/7/
Test FAILed.

@thisisdhaas
Copy link
Member

test this please

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ampcrowd/8/
Test PASSed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants