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

Fix ash template #1303

Merged
merged 3 commits into from
Feb 20, 2020
Merged

Fix ash template #1303

merged 3 commits into from
Feb 20, 2020

Conversation

gregsymons
Copy link
Contributor

This fixes #1302, and, in a much simpler way than #1276, #1264. Unfortunately, I don't understand the tests well enough to figure out where to hang a test for the bashisms specifically, nor the addResidual change. If you can give me some tips, I'd be glad to write them if you want me to.

@lightbend-cla-validator
Copy link

Hi @gregsymons,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Lightbend Contributors License Agreement:

http://www.lightbend.com/contribute/cla

@gregsymons
Copy link
Contributor Author

Clearly, I didn't understand the tests enough to see that there was already a test. That I have now made fail 😄. I'll be taking a closer look at this closer to the end of the week.

@muuki88 muuki88 added docker universal Zip, tar.gz, tgz and bash issues labels Feb 10, 2020
@muuki88
Copy link
Contributor

muuki88 commented Feb 10, 2020

Thanks @gregsymons for starting another take on since 🤗

I guess #1276 is the way forward to split bash and ash into two separate plugins to make it more explicit what is used.

Having said that, I have no idea when this will be ready to merge. So I'm happy to merge your solution to makes things work in the mean time.

@gregsymons
Copy link
Contributor Author

BTW, is there a way to see the output from the failure in the checks? Or is my best bet to get it to fail locally and inspect it there?

Signed-off-by: Greg Symons <gsymons@affinipay.com>
Signed-off-by: Greg Symons <gsymons@affinipay.com>
* The original test only coincidentally passed because the broken arg
  parsing didn't actually modify the command-line:

  * The -D argument _should_ have been consumed during argument parsing,
    but wasn't, so remained in residual.
  * The test app would not have outputted the -D argument had argument
    parsing been working, since it only output the app args, not the
    system properties.

* There is now a specific test each for the system properties and the
  residual args.

Signed-off-by: Greg Symons <gsymons@affinipay.com>
@gregsymons
Copy link
Contributor Author

I've got it working now, so once the checks pass, I'm ready to merge unless you'd like me to make any changes.

@gregsymons
Copy link
Contributor Author

Looks like the windows tests are failing for the same reason on other PRs, so I don't think I'm going to chase it down here. I'm ready for review.

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Thanks for adding the tests @gregsymons 👍

The windows test is failing for sometime now and I haven't had the time to pin this down 😞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docker universal Zip, tar.gz, tgz and bash issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AshScriptPlugin uses bash syntax to process args
3 participants