Remove dependency on alembic from testsuite (needed for RHEL)
AbandonedPublic
Actions

Authored by jskladan on Nov 4 2016, 7:36 AM.

Details

Reviewers

mprahl
ralph
• ralph2
tflink
mkrizek

Summary

It turns out that while they can consume
epel7 builds internally, they can't use epel7 builds while building
rpms. This causes a problem because the resultsdb test suite requires
python-alembic which is epel7 but not rhel7.

Test Plan

Ran testsuite without alembic present. Worked.
Did not try to build the package though - could anyone please try it? Thanks!

Diff Detail

Repository

rRSDB resultsdb

Branch

feature/remove_alembic_dep_from_tests

Lint

Lint Errors

Excuse: The tables need to be imported so db.create_all() works. No way around it that I know of :(

Severity	Location	Code	Message
Error	testing/functest_api_v20.py:28	F401	flake8 1
Error	testing/functest_api_v20.py:28	F401	flake8 1
Error	testing/functest_api_v20.py:28	F401	flake8 1
Error	testing/functest_api_v20.py:29	F401	flake8 1
Error	testing/functest_create_fedmsg.py:28	F401	flake8 1
Error	testing/functest_create_fedmsg.py:28	F401	flake8 1
Error	testing/functest_create_fedmsg.py:28	F401	flake8 1
Error	testing/functest_create_fedmsg.py:29	F401	flake8 1

Unit

No Unit Test Coverage

Build Status

Buildable 901
Build 901: arc lint + arc unit

jskladan retitled this revision from to Remove dependency on alembic from testsuite (needed for RHEL).Nov 4 2016, 7:36 AM

jskladan updated this object.

jskladan edited the test plan for this revision. (Show Details)

jskladan added reviewers: tflink, mkrizek, ralph, • ralph2.

jskladan added a reviewer: mprahl.Nov 4 2016, 7:37 AM

Builds fine in mock on my machine. LGTM

This revision is now accepted and ready to land.Nov 4 2016, 8:29 AM

if we ever end up with database upgrade tests, that could be an issue but that's not really something that's going to happen tomorrow.

Unfortunately, we have other epel-exclusive BuildRequires that I'm not sure would be so easy to patch out:

python-flask-restful
python-flask-sqlalchemy
python-iso8601

I keep coming back to the question of whether it would make more sense to just keep an epel7 branch with the fedora packages. I'm not a huge fan of doing that because of the level of responsibility which comes with epel but it might end up being a better choice.

Another option would be to have @ralph2 or @mprahl maintain the epel7 branch of resultsdb if they're willing/interested in taking on that responsibility.

In D1044#19573, @tflink wrote:

Unfortunately, we have other epel-exclusive BuildRequires that I'm not sure would be so easy to patch out:

python-flask-restful

python-flask-sqlalchemy

python-iso8601

*sigh* them epels...

I keep coming back to the question of whether it would make more sense to just keep an epel7 branch with the fedora packages...

What exactly does it mean? In general, and for us specifically?

jskladan added a project: resultsdb.Nov 6 2016, 9:12 AM

jskladan abandoned this revision.Nov 22 2016, 8:46 AM

Revision Contents

			Path	Packages
M			resultsdb.spec (1 line)
M			testing/functest_api_v20.py (10 lines)
M			testing/functest_create_fedmsg.py (8 lines)

Commit	Tree	Parents	Author	Summary	Date
4ef1e63fc285	a512a2010e63	5a000a270507	Josef Skladanka	Remove dependency on alembic from testsuite (needed for RHEL) (Show More…)	Nov 4 2016, 7:32 AM

Diff 2665

View Options

resultsdb.spec

Show All 12 Lines
13	Requires: python-alembic >= 0.8.3	13	Requires: python-alembic >= 0.8.3
14	Requires: python-flask >= 0.10.1	14	Requires: python-flask >= 0.10.1
15	Requires: python-flask-restful >= 0.2.11	15	Requires: python-flask-restful >= 0.2.11
16	Requires: python-flask-sqlalchemy >= 2.0	16	Requires: python-flask-sqlalchemy >= 2.0
17	Requires: python-iso8601 >= 0.1.10	17	Requires: python-iso8601 >= 0.1.10
18	Requires: python-six >= 1.9.0	18	Requires: python-six >= 1.9.0
19	Requires: python-sqlalchemy >= 0.9.8	19	Requires: python-sqlalchemy >= 0.9.8
20	BuildRequires: fedmsg >= 0.16.2	20	BuildRequires: fedmsg >= 0.16.2
21	BuildRequires: python-alembic >= 0.8.3
22	BuildRequires: python-flask >= 0.10.1	21	BuildRequires: python-flask >= 0.10.1
23	BuildRequires: python-flask-restful >= 0.2.11	22	BuildRequires: python-flask-restful >= 0.2.11
24	BuildRequires: python-flask-sqlalchemy >= 2.0	23	BuildRequires: python-flask-sqlalchemy >= 2.0
25	BuildRequires: python-iso8601 >= 0.1.10	24	BuildRequires: python-iso8601 >= 0.1.10
26	BuildRequires: pytest	25	BuildRequires: pytest
27	BuildRequires: python2-devel	26	BuildRequires: python2-devel
28	BuildRequires: python-setuptools	27	BuildRequires: python-setuptools
29		28
▲ Show 20 Lines • Show All 126 Lines • Show Last 20 Lines

View Options

testing/functest_api_v20.py

Show All 18 Lines
19		19
20	import json	20		import json
21	import datetime	21		import datetime
22	import os	22		import os
23	import tempfile	23		import tempfile
24	import copy	24		import copy
25		25
26	import resultsdb	26		import resultsdb
27	import resultsdb.cli	27		from resultsdb import db
28		28		from resultsdb.models.results import Group, Result, ResultData
			Lint: flake8 1 'Group' imported but unused
			Lint: flake8 1 'Result' imported but unused
			Lint: flake8 1 'ResultData' imported but unused
		29		from resultsdb.models.results import Testcase as TableTestcase
			Lint: flake8 1 'TableTestcase' imported but unused
29		30
30	class AboutTime(object):	31		class AboutTime(object):
31		32
32	def __eq__(self, value):	33		def __eq__(self, value):
33	start = (datetime.datetime.utcnow() - datetime.timedelta(seconds=10)).isoformat()	34		start = (datetime.datetime.utcnow() - datetime.timedelta(seconds=10)).isoformat()
34	stop = (datetime.datetime.utcnow() + datetime.timedelta(seconds=10)).isoformat()	35		stop = (datetime.datetime.utcnow() + datetime.timedelta(seconds=10)).isoformat()
35	return start <= value <= stop	36		return start <= value <= stop
36		37
37		38
38	class TestFuncApiV20():	39		class TestFuncApiV20():
39		40
40	@classmethod	41		@classmethod
41	def setup_class(cls):	42		def setup_class(cls):
42	cls.dbfile = tempfile.NamedTemporaryFile(delete=False)	43		cls.dbfile = tempfile.NamedTemporaryFile(delete=False)
43	cls.dbfile.close()	44		cls.dbfile.close()
44	resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name	45		resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name
45	resultsdb.app.config['FEDMSG_PUBLISH'] = False	46		resultsdb.app.config['FEDMSG_PUBLISH'] = False
46		47
47	@classmethod	48		@classmethod
48	def teardown_class(cls):	49		def teardown_class(cls):
49	os.unlink(cls.dbfile.name)	50		os.unlink(cls.dbfile.name)
50		51
51	def setup_method(self, method):	52		def setup_method(self, method):
52	resultsdb.cli.initialize_db(destructive=True)	53		# initialize db without alembic
		54		db.drop_all()
		55		db.create_all()
		56
53	self.app = resultsdb.app.test_client()	57		self.app = resultsdb.app.test_client()
54	self.ref_url_prefix = "http://localhost/api/v2.0"	58		self.ref_url_prefix = "http://localhost/api/v2.0"
55		59
56	# Testcase data	60		# Testcase data
57	self.ref_testcase_name = "scratch.testing.mytestcase"	61		self.ref_testcase_name = "scratch.testing.mytestcase"
58	self.ref_testcase_ref_url = "http://example.com/scratch.testing.mytestcase"	62		self.ref_testcase_ref_url = "http://example.com/scratch.testing.mytestcase"
59	self.ref_testcase = {	63		self.ref_testcase = {
60	'name': self.ref_testcase_name,	64		'name': self.ref_testcase_name,
▲ Show 20 Lines • Show All 665 Lines • Show Last 20 Lines

View Options

testing/functest_create_fedmsg.py

Show All 18 Lines
19		19
20	import json	20		import json
21	import datetime	21		import datetime
22	import os	22		import os
23	import tempfile	23		import tempfile
24	import copy	24		import copy
25		25
26	import resultsdb	26		import resultsdb
27	import resultsdb.cli	27		from resultsdb import db
		28		from resultsdb.models.results import Group, Result, ResultData
			Lint: flake8 1 'Group' imported but unused
			Lint: flake8 1 'Result' imported but unused
			Lint: flake8 1 'ResultData' imported but unused
		29		from resultsdb.models.results import Testcase as TableTestcase
			Lint: flake8 1 'TableTestcase' imported but unused
28	import resultsdb.controllers.api_v2 as apiv2	30		import resultsdb.controllers.api_v2 as apiv2
29		31
30		32
31	class MyResultData(object):	33		class MyResultData(object):
32		34
33	def __init__(self, key, value):	35		def __init__(self, key, value):
34	self.key = key	36		self.key = key
35	self.value = value	37		self.value = value
Show All 29 Lines		64	def setup_class(cls):
65	resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name	67		resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name
66	resultsdb.app.config['FEDMSG_PUBLISH'] = False	68		resultsdb.app.config['FEDMSG_PUBLISH'] = False
67		69
68	@classmethod	70		@classmethod
69	def teardown_class(cls):	71		def teardown_class(cls):
70	os.unlink(cls.dbfile.name)	72		os.unlink(cls.dbfile.name)
71		73
72	def setup_method(self, method):	74		def setup_method(self, method):
73	resultsdb.cli.initialize_db(destructive=True)	75		# initialize db without alembic
		76		db.drop_all()
		77		db.create_all()
74	self.app = resultsdb.app.test_client()	78		self.app = resultsdb.app.test_client()
75	self.ref_url_prefix = "http://localhost/api/v2.0"	79		self.ref_url_prefix = "http://localhost/api/v2.0"
76		80
77	# Testcase data	81		# Testcase data
78	self.ref_testcase_name = "scratch.testing.mytestcase"	82		self.ref_testcase_name = "scratch.testing.mytestcase"
79		83
80	# Group data	84		# Group data
81	self.ref_group_uuid = '3ce5f6d7-ce34-489b-ab61-325ce634eab5'	85		self.ref_group_uuid = '3ce5f6d7-ce34-489b-ab61-325ce634eab5'
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2665	5a000a2		Nov 4 2016, 7:36 AM	★	★

Remove dependency on alembic from testsuite (needed for RHEL)AbandonedPublicActions

Details

Diff Detail

Revision Contents

Diff 2665

resultsdb.spec

testing/functest_api_v20.py

testing/functest_create_fedmsg.py

Remove dependency on alembic from testsuite (needed for RHEL)
AbandonedPublic
Actions