ConfigFileOverrideAction() should only override if no config exists yet, fixes #900 #964
Conversation
This file contains 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
rfay
force-pushed
the
20180702_config_respect_php
branch
from
c30ffed
to
fa3a240
Compare
rfay
force-pushed
the
20180702_config_respect_php
branch
from
30c3f74
to
f4c9a53
Compare
andrewfrench
reviewed
Jul 5, 2018
|
|
||
| // testcommon.Chdir()() and CleanupDir() checks their own errors (and exit) | ||
| defer testcommon.CleanupDir(testDir) | ||
| defer testcommon.Chdir(testDir)() |
There was a problem hiding this comment.
This may be what you intend, but these deferred calls won't be executed until after the entire test is complete (when TestPostConfigAction returns) and not at the end of the for block.
There was a problem hiding this comment.
Yes, that pattern is used all over the place, it's just what we did back in the day. The cleanup after test completion is fine, it's all just about cleaning up the various crap directories.
andrewfrench
approved these changes
Jul 5, 2018
There was a problem hiding this comment.
cli v0.20.0-7-gf4c9a53d
web drud/nginx-php-fpm-local:v0.20.0
db drud/mariadb-local:20180630_mariabackup
dba drud/phpmyadmin:v0.20.0
router drud/ddev-router:v0.20.0
commit v0.20.0-7-gf4c9a53d
domain ddev.local
Using the steps in #900, I was able to recreate the issue and overwrite the PHP version in config.yaml repeatedly.
After building this branch, specified PHP versions are preserved after multiple executions of ddev config.
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.
The Problem/Issue/Bug:
#900 - ddev config incorrectly updates php version in some situations.
How this PR Solves The Problem:
ConfigOverrideAction() really should only override on a new config, and had only been used for D7 and D6. Both places it didn't work correctly.
It now only does its job if the config doesn't already exist.
Manual Testing Instructions:
Described in OP #900
Automated Testing Overview:
TestPostConfigAction() tests the expected behavior of ConfigFileOverrideAction().
Related Issue Link(s):
OP #900