respect tmp-outdir-prefix when containerless #467
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
kapilkd13
pushed a commit
to kapilkd13/cwltool
that referenced
this pull request
Jul 14, 2017
0f28896 Merge pull request common-workflow-language#408 from kapilkd13/master 18fc8d6 Merge branch 'master' into master d71b2f7 Merge pull request common-workflow-language#467 from kapilkd13/inlineJS-conformance 1f5f0de Update conformance_test_v1.0.yaml 8abc3f7 Merge pull request common-workflow-language#472 from common-workflow-language/no-draft-links 7134321 remove links to pre-v1.0 from homepage 2a88775 Merge pull request common-workflow-language#471 from common-workflow-language/changelong-tweak 0e0cb4b clarify that these change descriptions are specific to each of the standards da56971 added conformance test for InlineJavascriptRequirement 485be33 Merge pull request common-workflow-language#465 from common-workflow-language/video_link d874786 Add preview & link to intro video 397769d Merge pull request common-workflow-language#463 from common-workflow-language/hmenager-patch-1 cab882c version links ca21bdf moar 84bd265 Update cli-description-languages-comparison.md 0cd5307 Merge pull request common-workflow-language#464 from common-workflow-language/bd2k 1cd58d3 Update cli-description-languages-comparison.md 4834980 Add BD2K as a participating organization 80e52b5 Update cli-description-languages-comparison.md 4f1fcd5 Update cli-description-languages-comparison.md 145bd0b Update cli-description-languages-comparison.md c9ed818 Update cli-description-languages-comparison.md 1da94c2 Update cli-description-languages-comparison.md 1ff1819 Update cli-description-languages-comparison.md 24d782b Update cli-description-languages-comparison.md e793622 Create cli-description-languages-comparison.md 2625c13 adding conformance test: Testing warning instead of error when default path is not present 52d9fcb changes to enable nolinkcheck in case of default field, related to cwltool issue #2 git-subtree-dir: cwltool/schemas git-subtree-split: 0f28896
|
Jenkins, add to test list |
|
Jenkins, add to testlist |
tetron
pushed a commit
that referenced
this pull request
Jul 23, 2017
added conformance test for InlineJavascriptRequirement
|
I think the reason it deletes outdir from kwargs because it sets |
Codecov Report
@@ Coverage Diff @@
## master #467 +/- ##
==========================================
+ Coverage 62.93% 63.07% +0.13%
==========================================
Files 28 28
Lines 4589 4579 -10
Branches 1233 1225 -8
==========================================
Hits 2888 2888
+ Misses 1399 1390 -9
+ Partials 302 301 -1
Continue to review full report at Codecov.
|
mr-c
changed the title
tetron
approved these changes
May 14, 2018
tetron
reviewed
May 14, 2018
| @@ -622,7 +623,8 @@ def _init_job(self, joborder, **kwargs): | |||
| builder.tmpdir = builder.fs_access.docker_compatible_realpath(kwargs.get("docker_tmpdir") or "/tmp") | |||
| builder.stagedir = builder.fs_access.docker_compatible_realpath(kwargs.get("docker_stagedir") or "/var/lib/cwl") | |||
| else: | |||
| builder.outdir = builder.fs_access.realpath(kwargs.get("outdir") or tempfile.mkdtemp()) | |||
| builder.outdir = builder.fs_access.realpath(kwargs.get("outdir") | |||
| or tempfile.mkdtemp(prefix=kwargs["tmp_outdir_prefix"])) | |||
| if self.tool[u"class"] != 'Workflow': | |||
| builder.tmpdir = builder.fs_access.realpath(kwargs.get("tmpdir") or tempfile.mkdtemp()) | |||
There was a problem hiding this comment.
Does this need to be fixed as well?
|
@mr-c I think you're right. There might be a few other places with a similar bug? |
|
Jenkins, test this please |
Otherwise, the `--tmp-outdir-prefix` option passed on the command line is not respected, and outputs are instead written to the system temp directory.
This reverts commit dd77756.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise, the
--tmp-outdir-prefixoption passed on the command line is not respected, and outputs are instead written to the system temp directory.