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

Reconverge with OBS [part 3] #132

Merged
merged 28 commits into from
Apr 13, 2017
Merged

Reconverge with OBS [part 3] #132

merged 28 commits into from
Apr 13, 2017

Conversation

aspiers
Copy link
Member

@aspiers aspiers commented Feb 4, 2017

This is the third in a series of PRs to reconverge the codebase with the currently live code in OBS, which is represented by the changes in #123. (#125 was the first part, and #128 was the second.)

It still needs a commit to fix the PEP8 issues.

@aspiers aspiers requested a review from M0ses February 4, 2017 13:31
@aspiers
Copy link
Member Author

aspiers commented Feb 4, 2017

I think this is failing on Travis since the environment is missing both /etc/obs/services/tar_scm and ~/.obs/tar_scm, so the insertion of a fake section header into the config file doesn't take effect. So presumably

for opt in config.options('tar_scm'):

needs to be protected with:

    if config.has_section('tar_scm'):
        for opt in config.options('tar_scm'):

although this fake section header thing makes me uncomfortable. The tar_scm config file was never supposed to be in .ini format.

@aspiers
Copy link
Member Author

aspiers commented Feb 4, 2017

@M0ses The question is, why was this not failing before. I presume that there is some new test in this PR which is now covering this code path but I haven't checked. If so, the fix commit needs to be inserted in the sequence of commits prior to the new test, to avoid breaking git bisect.

Since the tests now exercise the get_config_options() code path, we
need to ensure we don't die if [tar_scm] config section is missing
(e.g. if we're testing on a machine which has neither
/etc/obs/services/tar_scm nor ~/.obs2/tar_scm.
@aspiers aspiers force-pushed the reconverge branch 2 times, most recently from 587ff60 to b3e197a Compare April 12, 2017 00:16
@aspiers aspiers force-pushed the reconverge branch 6 times, most recently from 2fe15bd to d05fb14 Compare April 13, 2017 00:31
This is the conventional Python approach, and it's more flexible
than editing a Makefile rule.
Piping test output through tee means that we have to now be careful to
catch failures in pipelines, otherwise make(1) would silently ignore a
failure of the test suite run caused by a module not being installed.
* Make it easier for cleanup script to identify oldest repos
@aspiers aspiers force-pushed the reconverge branch 2 times, most recently from 20c00a1 to 68eccf4 Compare April 13, 2017 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants