Differential D511

small fixes for bodhi_util issues that were killing depcheck execution
ClosedPublic
Actions

Authored by tflink on Aug 19 2015, 6:01 AM.

Details

Reviewers
kparal
Maniphest Tasks
T558: Test libtaskotron against bodhi 2.0
Commits
rLTRNe2edf846c0af: removed None from config defaults, added test to catch that in the future
Summary
  • fixing initialization issue where bodhi_utils couldn't be used
  • removed None from config defaults, added test to catch that in the future
Test Plan

works locally, mostly works on dev but network issues are preventing more testing there

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
tflink retitled this revision from to small fixes for bodhi_util issues that were killing depcheck execution.Aug 19 2015, 6:01 AM
tflink updated this object.
tflink edited the test plan for this revision. (Show Details)
tflink added a reviewer: kparal.
kparal accepted this revision.Aug 19 2015, 8:43 AM

If I understood correctly what this is about, it looks sane.

libtaskotron/config_defaults.py
36–37

I assume this diff is related to this? I.e. it crashed when loading a string password from the config file?

testing/test_bodhi_utils.py
25 ↗(On Diff #1339)

I got a bit confused here, whether it is a typo or not. A comment would be handy.

This revision is now accepted and ready to land.Aug 19 2015, 8:43 AM
kparal added a comment.Aug 19 2015, 11:08 AM

Please note that D514 fixes the Bodhi client initialization in a different way, so if it is accepted, we have to throw out the bodhi_utils.py (and probably also test_bodhi_utils.py) changes from this patch (and adjust the commit title).

tflink planned changes to this revision.Aug 19 2015, 2:25 PM

Removing bodhi_utils bits in favor of D514 after an apparent misunderstanding

libtaskotron/config_defaults.py
36–37

yeah, that's why stg has been blowing up since it was accidentally updated yesterday.

https://taskotron.stg.fedoraproject.org/taskmaster/builders/x86_64/builds/164054/steps/runtask/logs/stdio

testing/test_bodhi_utils.py
25 ↗(On Diff #1339)

If we're going forward with D514, it's going away anyways. it was a test to make sure that the BodhiClient isn't instantiated and thus, no network activity @ creation time

tflink updated this revision to Diff 1344.Aug 19 2015, 2:27 PM
  • removing fix for botched bodhi_utils change in liu of D514
This revision is now accepted and ready to land.Aug 19 2015, 2:27 PM
Closed by commit rLTRNe2edf846c0af: removed None from config defaults, added test to catch that in the future (authored by tflink). · Explain WhyAug 19 2015, 2:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1346

View Options

libtaskotron/config_defaults.py

Show All 27 Lines24 '''Global configuration for Taskotron (development profile).
28 documented here). 28​ documented here).
29 29​
30 Implementation notes: 30​ Implementation notes:
31 31​
32 * If you want to add a new option, put it here and optionally into the 32​ * If you want to add a new option, put it here and optionally into the
33 config file as well. 33​ config file as well.
34 * If you modify a default value for some option, don't forget to modify 34​ * If you modify a default value for some option, don't forget to modify
35 it in both places - here and in the config file (if present). 35​ it in both places - here and in the config file (if present).
36 * Don't assign ``None`` as a default value. We need to know a value type 36​ * Don't assign ``None`` as a default value. We need to know a value type
37 in order to check for correct type of user-provided values. 37​ in order to check for correct type of user-provided values.
kparalUnsubmitted
Not Done

I assume this diff is related to this? I.e. it crashed when loading a string password from the config file?

tflinkAuthorUnsubmitted
Not Done

yeah, that's why stg has been blowing up since it was accidentally updated yesterday.

https://taskotron.stg.fedoraproject.org/taskmaster/builders/x86_64/builds/164054/steps/runtask/logs/stdio

38 ''' 38​ '''
39 39​
40 '''Filename of the loaded config file. To be set after an external 40​ '''Filename of the loaded config file. To be set after an external
41 config file is loaded from the disk and its values merged with the 41​ config file is loaded from the disk and its values merged with the
42 default values. (If no config file is found, this is going to 42​ default values. (If no config file is found, this is going to
43 stay empty). *Do not* set this value manually in a config file 43​ stay empty). *Do not* set this value manually in a config file
44 itself - it is for internal use only.''' 44​ itself - it is for internal use only.'''
45 config_filename = '' #: 45​ config_filename = '' #:
Show All 26 Lines
72 cachedir = '/var/cache/taskotron' #: 72​ cachedir = '/var/cache/taskotron' #:
73 73​
74 log_level_stream = 'INFO' #: 74​ log_level_stream = 'INFO' #:
75 log_level_file = 'DEBUG' #: 75​ log_level_file = 'DEBUG' #:
76 76​
77 log_file_enabled = False #: 77​ log_file_enabled = False #:
78 78​
79 fas_username = 'taskotron' #: 79​ fas_username = 'taskotron' #:
80 fas_password = None #: 80​ fas_password = '' #:
81 81​
82 def __str__(self): 82​ def __str__(self):
83 ''' Make this object more readable when printing ''' 83​ ''' Make this object more readable when printing '''
84 return '<%s: %s>' % (self.__class__.__name__, 84​ return '<%s: %s>' % (self.__class__.__name__,
85 pprint.pformat(vars(self))) 85​ pprint.pformat(vars(self)))
86 86​
87 87​
88class ProductionConfig(Config): 88​class ProductionConfig(Config):
Show All 28 Lines
View Options

testing/test_config.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Unit tests for libtaskotron/config.py''' 6​'''Unit tests for libtaskotron/config.py'''
7 7​
8import os 8​import os
9import pytest 9​import pytest
10from StringIO import StringIO 10​from StringIO import StringIO
11 ​
12from libtaskotron import config 11​from libtaskotron import config
13from libtaskotron import exceptions as exc 12​from libtaskotron import exceptions as exc
14 13​
15 14​
16@pytest.mark.usefixtures('setup') 15​@pytest.mark.usefixtures('setup')
17class TestConfig(object): 16​class TestConfig(object):
18 17​
19 @pytest.fixture 18​ @pytest.fixture
▲ Show 20 Lines • Show All 125 Lines • ▼ Show 20 Line(s)143 def test_devel_profile_no_config(self, monkeypatch):
145 '''When there are no config files and no envvar, the profile should be 144​ '''When there are no config files and no envvar, the profile should be
146 set to 'development' ''' 145​ set to 'development' '''
147 self.unset_profile(monkeypatch) 146​ self.unset_profile(monkeypatch)
148 self.disable_create_dirs(monkeypatch) 147​ self.disable_create_dirs(monkeypatch)
149 # make sure we don't find any config files 148​ # make sure we don't find any config files
150 monkeypatch.setattr(config, 'CONF_DIRS', []) 149​ monkeypatch.setattr(config, 'CONF_DIRS', [])
151 conf = config.get_config() 150​ conf = config.get_config()
152 assert conf.profile == config.ProfileName.DEVELOPMENT 151​ assert conf.profile == config.ProfileName.DEVELOPMENT
152​
153​
154​class TestConfigDefaults(object):
155​
156​ configtypes = [config.Config(),
157​ config.TestingConfig(),
158​ config.ProductionConfig()
159​ ]
160​
161​ @pytest.fixture(params=configtypes)
162​ def getconfig(self, request):
163​ return request.param
164​
165​ def test_no_null_defaults(self, getconfig):
166​ for option in dir(getconfig):
167​ if option.startswith('_'):
168​ continue
169​ assert getattr(getconfig, option) is not None