Skip to content

Upstream merge - Add itest framework and fix regex#46

Merged
solarkennedy merged 14 commits intomasterfrom
upstream_merge
Jul 14, 2015
Merged

Upstream merge - Add itest framework and fix regex#46
solarkennedy merged 14 commits intomasterfrom
upstream_merge

Conversation

@solarkennedy
Copy link
Copy Markdown
Contributor

This adds travis integration, so that we know when things start breaking.

I've commented out 0.9.0 because these bindings do not work against it, and travis reflects that!

The tests are easily reproducible with "make itest", given you have python and docker installed.

Additionally I've fixed the regex thing by using the upstream regex from marathon.

Closes #44 #45

@mbabineau I do not have admin rights to the repo, can you enable travis integration:
https://travis-ci.org/profile/thefactory

solarkennedy added a commit that referenced this pull request Jul 14, 2015
Upstream merge - Add itest framework and fix regex
@solarkennedy solarkennedy merged commit e1ac853 into master Jul 14, 2015
@solarkennedy
Copy link
Copy Markdown
Contributor Author

@mbabineau I'm going to continue working against my for because it has the travis feedback against which marathon versions my code breaks/fixes. Please turn on Travis-ci https://travis-ci.org/profile/thefactory to activate that same badge on this repo.

@mbabineau
Copy link
Copy Markdown
Member

Sweet, enabled - thanks!

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.

2 participants