Differential D274

make bodhi url configurable
ClosedPublic
Actions

Authored by tflink on Jan 22 2015, 7:09 PM.

Details

Reviewers
mkrizek
Maniphest Tasks
T386: blockerbugs can't use stg bodhi
Commits
rBLKR81c573cedd5b: make bodhi url configurable, fixes T386
Summary

changed bodhi url to be configurable, updated example settings and updated conftest.py to always use TEST env

Test Plan

ran locally, sync works. unit tests also work

Diff Detail

Repository
rBLKR blockerbugs
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 make bodhi url configurable.Jan 22 2015, 7:09 PM
tflink updated this object.
tflink edited the test plan for this revision. (Show Details)
tflink added a reviewer: mkrizek.
mkrizek accepted this revision.Jan 22 2015, 7:30 PM

Looks good to me.

This revision is now accepted and ready to land.Jan 22 2015, 7:30 PM
Closed by commit rBLKR81c573cedd5b: make bodhi url configurable, fixes T386 (authored by tflink). · Explain WhyJan 22 2015, 7:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 758

View Options

blockerbugs/config.py

Show All 21 Lines
22 22​
23 23​
24class Config(object): 24​class Config(object):
25 DEBUG = True 25​ DEBUG = True
26 SQLALCHEMY_DATABASE_URI = 'sqlite://' 26​ SQLALCHEMY_DATABASE_URI = 'sqlite://'
27 BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/' 27​ BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'
28 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' 28​ BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
29 KOJI_URL = 'http://koji.stg.fedoraproject.org/' 29​ KOJI_URL = 'http://koji.stg.fedoraproject.org/'
30​ BODHI_URL = 'https://admin.stg.fedoraproject.org/updates/'
30 FAS_ADMIN_GROUP = 'qa-admin' 31​ FAS_ADMIN_GROUP = 'qa-admin'
31 FAS_HTTPS_REQUIRED = False 32​ FAS_HTTPS_REQUIRED = False
32 FAS_CHECK_CERT = False 33​ FAS_CHECK_CERT = False
33 FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/' 34​ FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/'
34 LOGFILE = '/var/log/blockerbugs/blockerbugs.log' 35​ LOGFILE = '/var/log/blockerbugs/blockerbugs.log'
35 FILE_LOGGING = False 36​ FILE_LOGGING = False
36 SYSLOG_LOGGING = False 37​ SYSLOG_LOGGING = False
37 STREAM_LOGGING = True 38​ STREAM_LOGGING = True
38 PRODUCTION = False 39​ PRODUCTION = False
39 40​
40 41​
41class ProductionConfig(Config): 42​class ProductionConfig(Config):
42 DEBUG = False 43​ DEBUG = False
43 BUGZILLA_URL = 'https://bugzilla.redhat.com/' 44​ BUGZILLA_URL = 'https://bugzilla.redhat.com/'
44 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' 45​ BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
45 KOJI_URL = 'http://koji.fedoraproject.org/' 46​ KOJI_URL = 'http://koji.fedoraproject.org/'
47​ BODHI_URL = 'https://admin.fedoraproject.org/updates/'
46 FAS_HTTPS_REQUIRED = True 48​ FAS_HTTPS_REQUIRED = True
47 FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/' 49​ FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/'
48 PRODUCTION = True 50​ PRODUCTION = True
49 51​
50 52​
51class DevelopmentConfig(Config): 53​class DevelopmentConfig(Config):
52 TRAP_BAD_REQUEST_ERRORS = True 54​ TRAP_BAD_REQUEST_ERRORS = True
53 SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/blockerbugs_db.sqlite' 55​ SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/blockerbugs_db.sqlite'
54 56​
55 57​
56class TestingConfig(Config): 58​class TestingConfig(Config):
57 TESTING = True 59​ TESTING = True
58 60​
View Options

blockerbugs/util/update_sync.py

Show All 18 Lines
19# 19​#
20# Authors: 20​# Authors:
21# Tim Flink <tflink@redhat.com> 21​# Tim Flink <tflink@redhat.com>
22from datetime import datetime 22​from datetime import datetime
23import logging 23​import logging
24 24​
25from fedora.client import bodhi, ServerError 25​from fedora.client import bodhi, ServerError
26 26​
27​from blockerbugs import app
27from blockerbugs.models.update import Update 28​from blockerbugs.models.update import Update
28from blockerbugs.models.bug import Bug 29​from blockerbugs.models.bug import Bug
29 30​
30bodhi_baseurl = 'https://admin.fedoraproject.org/updates/' 31​bodhi_baseurl = app.config['BODHI_URL']
31 32​
32 33​
33class UpdateSync(object): 34​class UpdateSync(object):
34 def __init__(self, db, bodhi_interface=None): 35​ def __init__(self, db, bodhi_interface=None):
35 self.db = db 36​ self.db = db
36 if bodhi_interface: 37​ if bodhi_interface:
37 self.bodhi_interface = bodhi_interface 38​ self.bodhi_interface = bodhi_interface
38 else: 39​ else:
▲ Show 20 Lines • Show All 139 Lines • Show Last 20 Lines
View Options

conf/settings.py.example

1# while you can use this as a template, we recommend that you use the blockerbugs 1​# while you can use this as a template, we recommend that you use the blockerbugs
2# cli to generate a config file 2​# cli to generate a config file
3SECRET_KEY = 'replace-me-with-something-random' 3​SECRET_KEY = 'replace-me-with-something-random'
4SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname' 4​SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname'
5FAS_ADMIN_GROUP = "magic-fas-group" 5​FAS_ADMIN_GROUP = "magic-fas-group"
6FAS_USER = "magicuser@unicornsarereal.com" 6​FAS_USER = "magicuser@unicornsarereal.com"
7FAS_PASSWORD = "password" 7​FAS_PASSWORD = "password"
8​BUGZILLA_URL = 'https://partner-bugzilla.redhat.com'
9​BUGZILLA_XMLRPC = 'https://partner-bugzilla.redhat.com/xmlrpc.cgi'
10​KOJI_URL = 'http://koji.stg.fedoraproject.org/'
11​BODHI_URL = 'https://admin.stg.fedoraproject.org/updates'
8FILE_LOGGING = False 12​FILE_LOGGING = False
9LOGFILE = /var/log/blockerbugs/blockerbugs.log 13​LOGFILE = /var/log/blockerbugs/blockerbugs.log
10SYSLOG_LOGGING = False 14​SYSLOG_LOGGING = False
11STREAM_LOGGING = True 15​STREAM_LOGGING = True
View Options

testing/conftest.py

Show All 14 Lines
15# 15​#
16# You should have received a copy of the GNU General Public License along 16​# You should have received a copy of the GNU General Public License along
17# with this program; if not, write to the Free Software Foundation, Inc., 17​# with this program; if not, write to the Free Software Foundation, Inc.,
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18​# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19# 19​#
20# Author: Tim Flink <tflink@redhat.com> 20​# Author: Tim Flink <tflink@redhat.com>
21 21​
22import pytest 22​import pytest
23import re 23​import os
24 24​
25 25​
26def pytest_addoption(parser): 26​def pytest_addoption(parser):
27 """ 27​ """
28 Add an option to the py.test parser to detect when the functional tests 28​ Add an option to the py.test parser to detect when the functional tests
29 should be detected and run 29​ should be detected and run
30 """ 30​ """
31 31​
Show All 14 Lines
46 46​
47 47​
48def pytest_configure(config): 48​def pytest_configure(config):
49 """This is a bit of a hack to detect whether or not we are running inside 49​ """This is a bit of a hack to detect whether or not we are running inside
50 a test environment""" 50​ a test environment"""
51 import sys 51​ import sys
52 52​
53 sys._called_from_test = True 53​ sys._called_from_test = True
54​
55​ # make sure that the testing config is used
56​ os.environ['TEST'] = 'true'
View Options

testing/test_updatesync_extract_information.py

Show First 20 Lines • Show All 129 Lines • ▼ Show 20 Line(s)127 def test_extract_karma(self):
130 130​
131 updateinfo = self.testsync.extract_information(self.testupdate) 131​ updateinfo = self.testsync.extract_information(self.testupdate)
132 132​
133 assert updateinfo['karma'] == ref_karma 133​ assert updateinfo['karma'] == ref_karma
134 134​
135 def test_extract_url(self): 135​ def test_extract_url(self):
136 updateinfo = self.testsync.extract_information(self.testupdate) 136​ updateinfo = self.testsync.extract_information(self.testupdate)
137 137​
138 assert (updateinfo['url'] == 'https://admin.fedoraproject.org/updates/%s' % self.testupdate.updateid) 138​ assert (updateinfo['url'] == 'https://admin.stg.fedoraproject.org/updates/%s' % self.testupdate.updateid)
139 139​
140 def test_extract_url_no_updateid(self): 140​ def test_extract_url_no_updateid(self):
141 ref_title = u'magic-fixall-update-1.1-0' 141​ ref_title = u'magic-fixall-update-1.1-0'
142 self.testupdate.title = ref_title 142​ self.testupdate.title = ref_title
143 self.testupdate.updateid = None 143​ self.testupdate.updateid = None
144 144​
145 updateinfo = self.testsync.extract_information(self.testupdate) 145​ updateinfo = self.testsync.extract_information(self.testupdate)
146 146​
147 baseurl = 'https://admin.fedoraproject.org/updates/%s' 147​ baseurl = 'https://admin.stg.fedoraproject.org/updates/%s'
148 148​
149 assert (updateinfo['url'] == 'https://admin.fedoraproject.org/updates/%s' % ref_title) 149​ assert (updateinfo['url'] == 'https://admin.stg.fedoraproject.org/updates/%s' % ref_title)
150 150​
151 def test_extract_date_pushed_testing_intesting(self): 151​ def test_extract_date_pushed_testing_intesting(self):
152 self.testupdate.status = u'testing' 152​ self.testupdate.status = u'testing'
153 self.testupdate.request = None 153​ self.testupdate.request = None
154 self.testupdate.date_pushed = u'2012-09-13 16:40:28' 154​ self.testupdate.date_pushed = u'2012-09-13 16:40:28'
155 155​
156 updateinfo = self.testsync.extract_information(self.testupdate) 156​ updateinfo = self.testsync.extract_information(self.testupdate)
157 157​
▲ Show 20 Lines • Show All 76 Lines • Show Last 20 Lines