Changing config setups #742
Merged
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
|
retest this please |
|
|
||
| wipe_temp_dir() | ||
|
|
||
| from Ganga.Utility.Config import setConfigOption | ||
| setConfigOption('Configuration', 'gangadir', '/tmp/ganga_topdir-$USER') |
There was a problem hiding this comment.
For this to work, you need to shift the wipe_temp_dir call as well. That's what's causing the test failures.
|
this could be revealing of an uncaught bug: |
|
OK, this actually revealed a small bug in the flow of 1 test. Thankfully this doesn't mean that there are any problems with what was mainly being tested and only a few small changes are needed. |
|
OK, ready to merge, can someone have a look at this? |
| @@ -63,8 +61,7 @@ def test_a_JobConstruction(self): | |||
|
|
|||
| def test_b_TestRemoveSJXML(self): | |||
| # Remove XML force to use backup | |||
| from Ganga.GPI import jobs | |||
| XMLFileName = getSJXMLFile(jobs(0).subjobs(0)) | |||
| XMLFileName = getSJXMLFile((0, 0)) | |||
There was a problem hiding this comment.
Is this change supposed to be a part of this PR?
There was a problem hiding this comment.
yes because the test is broken without this
|
Go for merge from me. |
rob-c
added a commit
that referenced
this pull request
Sep 16, 2016
* Fixing big in way that tests initialize the 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.
This PR guarantees that all of the config changes are applied before any jobs involved in any of the tests are touched by the monitoring code.
This should effect no tests but it does dramatically mess with the new MassStorage ones #735 so I'd advise that all future tests avoid the use of
setConfigOptionoverextra_opts.This change in behaviour of the Ganga codebase can be traced to when the changes went into the GangaUnitTest around the handling of the configuration parameters. Setting them back to the default value led to some extremely strange behaviour where code would fail for 0.5s then succeed for the next 10sec due to the monitoring code starting up before the
setUpmethods had finished executing.