resultsdb/cli.py
75	I think that this logic needs to be reworked a bit so that the `drop_all()` and `create_all()` are combined with current_rev so that the alembic revision is initialized. I tried this code locally and it seems to work for a trivial usecase but it still concerns me a little

alembic/README
1 ↗	(On Diff #801)	It seems kinda silly to have this in git - can you either remove it from the revision or fill it out with something less generic?

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	791	4572514		Feb 23 2015, 4:50 PM	★	★
Diff 2	796	4572514	- Changed the cli.py to use Alembic	Feb 24 2015, 11:26 AM	★	★
Diff 3	797	4572514	- Forgot to remove the FIXME comment	Feb 24 2015, 11:28 AM	★	★
Diff 4	798	4572514	- Fixed the testsuite	Feb 24 2015, 1:28 PM	★	★
Diff 5	800	4572514	- Added alembic to specfile	Feb 24 2015, 2:07 PM	★	★
Diff 6	801	4572514	- Changed the init_db process to be saner	Feb 24 2015, 7:41 PM	★	★
Diff 7	821	4572514	Commit rRSDB9557a3ca41e4478ec98963c5d035a26d14e42c35	Feb 25 2015, 9:25 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
6bc333c33c1e	66aed523e4ae	08ad37656cd0	Josef Skladanka	Changed the init_db process to be saner	Feb 24 2015, 7:13 PM
08ad37656cd0	009c8f708367	a45049cb00f0	Josef Skladanka	Added alembic to specfile	Feb 24 2015, 2:07 PM
a45049cb00f0	5869066c9319	923c99253fd9	Josef Skladanka	Fixed the testsuite (Show More…)	Feb 24 2015, 1:18 PM
923c99253fd9	4f694d2bf2c2	22ef2a647b13	Josef Skladanka	Forgot to remove the FIXME comment	Feb 24 2015, 11:28 AM
22ef2a647b13	5c12344a761b	5f72dca0e0ed	Josef Skladanka	Changed the cli.py to use Alembic	Feb 24 2015, 11:26 AM
5f72dca0e0ed	7c1d392cf5ec	457251486786	Josef Skladanka	Initial Alembic support (Show More…)	Feb 23 2015, 4:18 PM

	Status	Author	Revision
	Closed	jskladan	D292 Added UUID to Job
	Closed	jskladan	D291 Initial Alembic support

Diff 821

alembic.ini

This file was added.

		1		# A generic, single database configuration.
		2
		3		[alembic]
		4		# path to migration scripts
		5		script_location = alembic
		6
		7		# template used to generate migration files
		8		# file_template = %%(rev)s_%%(slug)s
		9
		10		# max length of characters to apply to the
		11		# "slug" field
		12		#truncate_slug_length = 40
		13
		14		# set to 'true' to run the environment during
		15		# the 'revision' command, regardless of autogenerate
		16		# revision_environment = false
		17
		18		# set to 'true' to allow .pyc and .pyo files without
		19		# a source .py file to be detected as revisions in the
		20		# versions/ directory
		21		# sourceless = false
		22
		23		# version location specification; this defaults
		24		# to alembic/versions. When using multiple version
		25		# directories, initial revisions must be specified with --version-path
		26		# version_locations = %(here)s/bar %(here)s/bat alembic/versions
		27
		28		# the output encoding used when revision files
		29		# are written from script.py.mako
		30		# output_encoding = utf-8
		31
		32		sqlalchemy.url = driver://user:pass@localhost/dbname
		33
		34		[alembic-packaged]
		35		# path to migration scripts on a packaged install
		36		script_location = /usr/share/resultsdb/alembic
		37
		38		sqlalchemy.url = driver://user:pass@localhost/dbname
		39
		40
		41		# Logging configuration
		42		[loggers]
		43		keys = root,sqlalchemy,alembic
		44
		45		[handlers]
		46		keys = console
		47
		48		[formatters]
		49		keys = generic
		50
		51		[logger_root]
		52		level = WARN
		53		handlers = console
		54		qualname =
		55
		56		[logger_sqlalchemy]
		57		level = WARN
		58		handlers =
		59		qualname = sqlalchemy.engine
		60
		61		[logger_alembic]
		62		level = INFO
		63		handlers =
		64		qualname = alembic
		65
		66		[handler_console]
		67		class = StreamHandler
		68		args = (sys.stderr,)
		69		level = NOTSET
		70		formatter = generic
		71
		72		[formatter_generic]
		73		format = %(levelname)-5.5s [%(name)s] %(message)s
		74		datefmt = %H:%M:%S

View Options

alembic/env.py

This file was added.

		1		from __future__ import with_statement
		2		from alembic import context
		3		from sqlalchemy import engine_from_config, pool
		4		from logging.config import fileConfig
		5
		6		# add '.' to the pythonpath to support migration inside development env
		7		import sys
		8		sys.path.append('.')
		9
		10		# this is the Alembic Config object, which provides
		11		# access to the values within the .ini file in use.
		12		config = context.config
		13
		14		# Interpret the config file for Python logging.
		15		# This line sets up loggers basically.
		16		fileConfig(config.config_file_name)
		17
		18		# add your model's MetaData object here
		19		# for 'autogenerate' support
		20		from resultsdb import db
		21		target_metadata = db.metadata
		22		#target_metadata = None
		23
		24		# other values from the config, defined by the needs of env.py,
		25		# can be acquired:
		26		# my_important_option = config.get_main_option("my_important_option")
		27		# ... etc.
		28
		29		def run_migrations_offline():
		30		"""Run migrations in 'offline' mode.
		31
		32		This configures the context with just a URL
		33		and not an Engine, though an Engine is acceptable
		34		here as well. By skipping the Engine creation
		35		we don't even need a DBAPI to be available.
		36
		37		Calls to context.execute() here emit the given string to the
		38		script output.
		39
		40		"""
		41		url = config.get_main_option("sqlalchemy.url")
		42		context.configure(url=url)
		43
		44		with context.begin_transaction():
		45		context.run_migrations()
		46
		47		def run_migrations_online():
		48		"""Run migrations in 'online' mode.
		49
		50		In this scenario we need to create an Engine
		51		and associate a connection with the context.
		52
		53		"""
		54
		55		alembic_config = config.get_section(config.config_ini_section)
		56		from resultsdb import app
		57		alembic_config['sqlalchemy.url'] = app.config['SQLALCHEMY_DATABASE_URI']
		58
		59		engine = engine_from_config(
		60		alembic_config,
		61		prefix='sqlalchemy.',
		62		poolclass=pool.NullPool)
		63
		64		connection = engine.connect()
		65		context.configure(
		66		connection=connection,
		67		target_metadata=target_metadata
		68		)
		69
		70		try:
		71		with context.begin_transaction():
		72		context.run_migrations()
		73		finally:
		74		connection.close()
		75
		76		if context.is_offline_mode():
		77		run_migrations_offline()
		78		else:
		79		run_migrations_online()
		80

View Options

alembic/script.py.mako

This file was added.

		1		"""${message}
		2
		3		Revision ID: ${up_revision}
		4		Revises: ${down_revision \| comma,n}
		5		Create Date: ${create_date}
		6
		7		"""
		8
		9		# revision identifiers, used by Alembic.
		10		revision = ${repr(up_revision)}
		11		down_revision = ${repr(down_revision)}
		12		branch_labels = ${repr(branch_labels)}
		13		depends_on = ${repr(depends_on)}
		14
		15		from alembic import op
		16		import sqlalchemy as sa
		17		${imports if imports else ""}
		18
		19		def upgrade():
		20		${upgrades if upgrades else "pass"}
		21
		22
		23		def downgrade():
		24		${downgrades if downgrades else "pass"}

View Options

alembic/versions/15f5eeb9f635_initial_revision.py

This file was added.

		1		"""Initial revision
		2
		3		Revision ID: 15f5eeb9f635
		4		Revises:
		5		Create Date: 2015-02-23 17:40:33.366352
		6
		7		"""
		8
		9		# revision identifiers, used by Alembic.
		10		revision = '15f5eeb9f635'
		11		down_revision = None
		12		branch_labels = None
		13		depends_on = None
		14
		15		from alembic import op
		16		import sqlalchemy as sa
		17
		18
		19		def upgrade():
		20		### commands auto generated by Alembic - please adjust! ###
		21		pass
		22		### end Alembic commands ###
		23
		24
		25		def downgrade():
		26		### commands auto generated by Alembic - please adjust! ###
		27		pass
		28		### end Alembic commands ###

View Options

alembic/versions/433d0b5b3b96_added_index_on_the_keyval_store.py

This file was added.

		1		"""Added index on the Keyval store
		2
		3		Revision ID: 433d0b5b3b96
		4		Revises: 15f5eeb9f635
		5		Create Date: 2015-02-24 19:57:57.643189
		6
		7		"""
		8
		9		# revision identifiers, used by Alembic.
		10		revision = '433d0b5b3b96'
		11		down_revision = '15f5eeb9f635'
		12		branch_labels = None
		13		depends_on = None
		14
		15		from alembic import op
		16		import sqlalchemy as sa
		17
		18
		19		def upgrade():
		20		### commands auto generated by Alembic - please adjust! ###
		21		op.create_index('rd_key_value_idx', 'result_data', ['key', 'value'], unique=False, mysql_length={'value': 50, 'key': 20})
		22		### end Alembic commands ###
		23
		24
		25		def downgrade():
		26		### commands auto generated by Alembic - please adjust! ###
		27		op.drop_index('rd_key_value_idx', table_name='result_data')
		28		### end Alembic commands ###

View Options

requirements.txt

1	Flask>=0.9	1	Flask>=0.9
2	Flask-SQLAlchemy>=0.16	2	Flask-SQLAlchemy>=0.16
3	SQLAlchemy>= 0.7	3	SQLAlchemy>= 0.7
4	WTForms>1.0	4	WTForms>1.0
5	Flask-WTF>=0.8	5	Flask-WTF>=0.8
6	Flask-Login>=0.2.2	6	Flask-Login>=0.2.2
7	Flask-RESTful >= 0.2.5	7	Flask-RESTful >= 0.2.5
8	pytest>=2.4.2	8	pytest>=2.4.2
9	pytest-cov>=1.6	9	pytest-cov>=1.6
		10	alembic>=0.7.4
10	# although this is a Flask-Restful dependency, it was not installed, adding manualy	11	# although this is a Flask-Restful dependency, it was not installed, adding manualy
11	six	12	six
12	iso8601 >= 0.1.4	13	iso8601 >= 0.1.4

View Options

resultsdb.spec

1	%if ! (0%{?fedora} > 12 \|\| 0%{?rhel} > 5)	1	%if ! (0%{?fedora} > 12 \|\| 0%{?rhel} > 5)
2	%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}	2	%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
3	%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}	3	%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
4	%endif	4	%endif
5		5
6	Name: resultsdb	6	Name: resultsdb
7	Version: 1.1.7	7	Version: 1.1.8
8	Release: 1%{?dist}	8	Release: 1%{?dist}
9	Summary: Results store for automated tasks	9	Summary: Results store for automated tasks
10		10
11	License: GPLv2+	11	License: GPLv2+
12	URL: https://bitbucket.org/fedoraqa/resultsdb	12	URL: https://bitbucket.org/fedoraqa/resultsdb
13	Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz	13	Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
14		14
15	BuildArch: noarch	15	BuildArch: noarch
16		16
17	Requires: python-flask	17	Requires: python-flask
18	Requires: python-flask-sqlalchemy	18	Requires: python-flask-sqlalchemy
19	Requires: python-flask-wtf	19	Requires: python-flask-wtf
20	Requires: python-flask-login	20	Requires: python-flask-login
21	Requires: python-flask-restful	21	Requires: python-flask-restful
22	Requires: python-six	22	Requires: python-six
23	Requires: python-iso8601	23	Requires: python-iso8601
		24	Requires: python-alembic
24	BuildRequires: python2-devel python-setuptools	25	BuildRequires: python2-devel python-setuptools
25		26
26	%description	27	%description
27	ResultsDB is a results store engine for (not only) FedoraQA tools.	28	ResultsDB is a results store engine for (not only) FedoraQA tools.
28	Repositories	29	Repositories
29		30
30	%prep	31	%prep
31	%setup -q	32	%setup -q
32		33
33	%build	34	%build
34	%{__python2} setup.py build	35	%{__python2} setup.py build
35		36
36	%install	37	%install
37	%{__python2} setup.py install --skip-build --root %{buildroot}	38	%{__python2} setup.py install --skip-build --root %{buildroot}
38		39
		40	# alembic stuff
		41	mkdir -p %{buildroot}%{_datadir}/resultsdb
		42	cp -r alembic %{buildroot}%{_datadir}/resultsdb/.
		43	cp alembic.ini %{buildroot}%{_datadir}/resultsdb/.
		44
		45
39	# apache and wsgi settings	46	# apache and wsgi settings
40	mkdir -p %{buildroot}%{_datadir}/resultsdb/conf	47	mkdir -p %{buildroot}%{_datadir}/resultsdb/conf
41	cp conf/resultsdb.conf %{buildroot}%{_datadir}/resultsdb/conf/.	48	cp conf/resultsdb.conf %{buildroot}%{_datadir}/resultsdb/conf/.
42	cp conf/resultsdb.wsgi %{buildroot}%{_datadir}/resultsdb/.	49	cp conf/resultsdb.wsgi %{buildroot}%{_datadir}/resultsdb/.
43		50
44	mkdir -p %{buildroot}%{_sysconfdir}/resultsdb	51	mkdir -p %{buildroot}%{_sysconfdir}/resultsdb
45	install conf/settings.py.example %{buildroot}%{_sysconfdir}/resultsdb/settings.py.example	52	install conf/settings.py.example %{buildroot}%{_sysconfdir}/resultsdb/settings.py.example
46		53
47	%files	54	%files
48	%doc README.md conf/*	55	%doc README.md conf/*
49	%{python_sitelib}/resultsdb	56	%{python_sitelib}/resultsdb
50	%{python_sitelib}/*.egg-info	57	%{python_sitelib}/*.egg-info
51		58
52	%attr(755,root,root) %{_bindir}/resultsdb	59	%attr(755,root,root) %{_bindir}/resultsdb
53	%dir %{_sysconfdir}/resultsdb	60	%dir %{_sysconfdir}/resultsdb
54	%{_sysconfdir}/resultsdb/*	61	%{_sysconfdir}/resultsdb/*
55	%dir %{_datadir}/resultsdb	62	%dir %{_datadir}/resultsdb
56	%{_datadir}/resultsdb/*	63	%{_datadir}/resultsdb/*
57		64
58	%changelog	65	%changelog
		66	* Tue Feb 24 2015 Josef Skladanka <jskladan@fedoraproject.org> - 1.1.8-1
		67	- added Alembic support
		68
59	* Thu Oct 9 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.7-1	69	* Thu Oct 9 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.7-1
60	- fix jsonp interface and various associated bugs	70	- fix jsonp interface and various associated bugs
61		71
62	* Fri Jul 3 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.4-1	72	* Fri Jul 3 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.4-1
63	- fix compatibility with flask-wtf 0.9	73	- fix compatibility with flask-wtf 0.9
64		74
65	* Mon Jun 23 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.3-1	75	* Mon Jun 23 2014 Tim Flink <tflink@fedoraproject.org> - 1.1.3-1
66	- add SHOW_DB_URI configuration value to stop DB URI leaking	76	- add SHOW_DB_URI configuration value to stop DB URI leaking
Show All 23 Lines

View Options

resultsdb/cli.py

Show All 16 Lines
17	# Authors:	17		# Authors:
18	# Josef Skladanka <jskladan@redhat.com>	18		# Josef Skladanka <jskladan@redhat.com>
19		19
20	# This is required for running on EL6	20		# This is required for running on EL6
21	import __main__	21		import __main__
22	__main__.__requires__ = ['SQLAlchemy >= 0.7', 'Flask >= 0.9', 'jinja2 >= 2.6']	22		__main__.__requires__ = ['SQLAlchemy >= 0.7', 'Flask >= 0.9', 'jinja2 >= 2.6']
23	import pkg_resources	23		import pkg_resources
24		24
25		25		import os
26	from optparse import OptionParser
27	import sys	26		import sys
28	import datetime	27		import datetime
		28		from optparse import OptionParser
		29
		30		from alembic.config import Config
		31		from alembic import command as al_command
		32		from alembic.migration import MigrationContext
29		33
30	from resultsdb import db	34		from resultsdb import db
31	from resultsdb.models.user import User	35		from resultsdb.models.user import User
32	from resultsdb.models.results import Job, Testcase, Result, ResultData	36		from resultsdb.models.results import Job, Testcase, Result, ResultData
33		37
		38		from sqlalchemy.engine import reflection
		39
		40		def get_alembic_config():
		41		# the location of the alembic ini file and alembic scripts changes when
		42		# installed via package
		43		if os.path.exists("./alembic.ini"):
		44		alembic_cfg = Config("./alembic.ini")
		45		else:
		46		alembic_cfg = Config("/usr/share/resultsdb/alembic.ini",
		47		ini_section='alembic-packaged')
		48		return alembic_cfg
		49
		50		def upgrade_db(*args):
		51		print "Upgrading Database to Latest Revision"
		52		alembic_cfg = get_alembic_config()
		53		al_command.upgrade(alembic_cfg, "head")
		54
		55		def init_alembic(*args):
		56		alembic_cfg = get_alembic_config()
		57
		58		# check to see if the db has already been initialized by checking for an
		59		# alembic revision
		60		context = MigrationContext.configure(db.engine.connect())
		61		current_rev = context.get_current_revision()
		62
		63		if not current_rev:
		64		print "Initializing alembic"
		65		print " - Setting the current version to the first revision"
		66		al_command.stamp(alembic_cfg, "15f5eeb9f635")
		67		else:
		68		print "Alembic already initialized"
		69
34	def initialize_db(destructive):	70		def initialize_db(destructive):
		71		alembic_cfg = get_alembic_config()
		72
35	print "Initializing database"	73		print "Initializing database"
		74
36	if destructive:	75		if destructive:
			tflinkUnsubmitted Not Done I think that this logic needs to be reworked a bit so that the `drop_all()` and `create_all()` are combined with current_rev so that the alembic revision is initialized. I tried this code locally and it seems to work for a trivial usecase but it still concerns me a little
37	print " - Dropping all tables"	76		print " - Dropping all tables"
38	db.drop_all()	77		db.drop_all()
39	print " - Creating tables"	78
40	db.create_all()	79		# check whether the table 'job' exists
		80		# if it does, we assume that the database is empty
		81		insp = reflection.Inspector.from_engine(db.engine)
		82		table_names = insp.get_table_names()
		83		if 'job' not in table_names and 'Job' not in table_names:
		84		print " - Creating tables"
		85		db.create_all()
		86		print " - Stamping alembic's current version to 'head'"
		87		al_command.stamp(alembic_cfg, "head")
		88
		89		# check to see if the db has already been initialized by checking for an
		90		# alembic revision
		91		context = MigrationContext.configure(db.engine.connect())
		92		current_rev = context.get_current_revision()
		93		if current_rev:
		94		print " - Database is currently at rev %s" % current_rev
		95		upgrade_db(destructive)
		96		else:
		97		print "WARN: You need to have your db stamped with an alembic revision"
		98		print " Run 'init_alembic' sub-command first."
41		99
42	def mock_data(destructive):	100		def mock_data(destructive):
43	print "Populating tables with mock-data"	101		print "Populating tables with mock-data"
44		102
45	if destructive or not db.session.query(User).count():	103		if destructive or not db.session.query(User).count():
46	print " - User"	104		print " - User"
47	data_users = [('admin', 'admin'), ('user', 'user')]	105		data_users = [('admin', 'admin'), ('user', 'user')]
48		106
Show All 33 Lines		115	if destructive or not db.session.query(Testcase).count():
82	db.session.add(j2)	140		db.session.add(j2)
83		141
84	db.session.commit()	142		db.session.commit()
85	else:	143		else:
86	print " - skipped Testcase, Job, Result, ResultData"	144		print " - skipped Testcase, Job, Result, ResultData"
87		145
88		146
89	def main():	147		def main():
90	possible_commands = ['init_db', 'mock_data']	148		possible_commands = ['init_db', 'mock_data', 'upgrade_db', 'init_alembic']
91		149
92	usage = 'usage: [DEV=true] %prog ' + "(%s)" % ' \| '.join(possible_commands)	150		usage = 'usage: [DEV=true] %prog ' + "(%s)" % ' \| '.join(possible_commands)
93	parser = OptionParser(usage=usage)	151		parser = OptionParser(usage=usage)
94	parser.add_option("-d", "--destructive",	152		parser.add_option("-d", "--destructive",
95	action="store_true", dest="destructive", default=False,	153		action="store_true", dest="destructive", default=False,
96	help="Drop tables in `init_db`; Store data in `mock_data` "	154		help="Drop tables in `init_db`; Store data in `mock_data` "
97	"even if the tables are not empty")	155		"even if the tables are not empty")
98		156
99	(options, args) = parser.parse_args()	157		(options, args) = parser.parse_args()
100		158
101	if len(args) != 1 or args[0] not in possible_commands:	159		if len(args) != 1 or args[0] not in possible_commands:
102	print usage	160		print usage
103	print	161		print
104	print 'Please use one of the following commands: %s' % str(possible_commands)	162		print 'Please use one of the following commands: %s' % str(possible_commands)
105	sys.exit(1)	163		sys.exit(1)
106		164
107	command = {	165		command = {
108	'init_db': initialize_db,	166		'init_db': initialize_db,
		167		'upgrade_db': upgrade_db,
109	'mock_data': mock_data,	168		'mock_data': mock_data,
		169		'init_alembic': init_alembic,
110	}[args[0]]	170		}[args[0]]
111		171
112	if not options.destructive:	172		if not options.destructive:
113	print "Proceeding with non-destructive init. To perform destructive "\	173		print "Proceeding in non-destructive mode. To perform destructive "\
114	"steps use -d option."	174		"steps use -d option."
115		175
116	command(options.destructive)	176		command(options.destructive)
117		177
118	sys.exit(0)	178		sys.exit(0)
119		179
120		180
121	if __name__ == '__main__':	181		if __name__ == '__main__':
122	main()	182		main()
123		183

View Options

resultsdb/config.py

Show All 37 Lines
38		38
39	class ProductionConfig(Config):	39	class ProductionConfig(Config):
40	DEBUG = False	40	DEBUG = False
41	PRODUCTION = True	41	PRODUCTION = True
42		42
43		43
44	class DevelopmentConfig(Config):	44	class DevelopmentConfig(Config):
45	TRAP_BAD_REQUEST_ERRORS = True	45	TRAP_BAD_REQUEST_ERRORS = True
46	SQLALCHEMY_DATABASE_URI = \	46	SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/resultsdb.db'
47	'mysql://resultsdb:TOP_SECRET_PASSWORD@localhost/resultsdb'
48	HOST = '0.0.0.0'	47	HOST = '0.0.0.0'
49	PORT = 5000	48	PORT = 5000
50		49
51		50
52	class TestingConfig(Config):	51	class TestingConfig(Config):
53	TRAP_BAD_REQUEST_ERRORS = True	52	TRAP_BAD_REQUEST_ERRORS = True
54	TESTING = True	53	TESTING = True

View Options

resultsdb/models/results.py

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Line(s)
89	class ResultData(db.Model, DBSerialize):	89	class ResultData(db.Model, DBSerialize):
90		90
91	id = db.Column(db.Integer, primary_key = True)	91	id = db.Column(db.Integer, primary_key = True)
92	result_id = db.Column(db.Integer, db.ForeignKey('result.id'))	92	result_id = db.Column(db.Integer, db.ForeignKey('result.id'))
93		93
94	key = db.Column(db.Text)	94	key = db.Column(db.Text)
95	value = db.Column(db.Text)	95	value = db.Column(db.Text)
96		96
97	#FIXME: the index is not created with db.create_all() why?	97	__table_args__ = (db.Index('rd_key_value_idx', 'key', 'value', mysql_length={'key': 20, 'value': 50}), )
98	db.Index('rd_key_value_idx', 'key', 'value', mysql_length={'key': 20, 'value': 50})
99		98
100	def __init__(self, result, key, value):	99	def __init__(self, result, key, value):
101	self.result = result	100	self.result = result
102	self.key = key	101	self.key = key
103	self.value = value	102	self.value = value
104		103

View Options

testing/functest_api.py

Show All 13 Lines
14	# with this program; if not, write to the Free Software Foundation, Inc.,	14		# with this program; if not, write to the Free Software Foundation, Inc.,
15	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	15		# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
16	#	16		#
17	# Authors:	17		# Authors:
18	# Martin Krizek <mkrizek@redhat.com>	18		# Martin Krizek <mkrizek@redhat.com>
19		19
20	import json	20		import json
21	import datetime	21		import datetime
		22		import os
		23		import tempfile
22		24
23	import resultsdb	25		import resultsdb
24	import resultsdb.cli	26		import resultsdb.cli
25		27
26	class TestFuncApi():	28		class TestFuncApi():
27	@classmethod	29		@classmethod
28	def setup_class(cls):	30		def setup_class(cls):
29	resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite://'	31		cls.dbfile = tempfile.NamedTemporaryFile(delete=False)
		32		cls.dbfile.close()
		33		resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name
		34
		35		@classmethod
		36		def teardown_class(cls):
		37		os.unlink(cls.dbfile.name)
30		38
31	def setup_method(self, method):	39		def setup_method(self, method):
32	self.app = resultsdb.app.test_client()	40		self.app = resultsdb.app.test_client()
33	resultsdb.cli.initialize_db(destructive=True)	41		resultsdb.cli.initialize_db(destructive=True)
34		42
35	self.ref_testcase_name = "testcase"	43		self.ref_testcase_name = "testcase"
36	self.ref_testcase_url = "http://fedoraqa.fedoraproject.org/%s" % self.ref_testcase_name	44		self.ref_testcase_url = "http://fedoraqa.fedoraproject.org/%s" % self.ref_testcase_name
37	self.ref_job_id = 1	45		self.ref_job_id = 1
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)		92	def test_update_invalid_testcase(self):
89	data = json.loads(r.data)	97		data = json.loads(r.data)
90		98
91	assert r.status_code == 404	99		assert r.status_code == 404
92	assert data['message'] == "Testcase not found"	100		assert data['message'] == "Testcase not found"
93		101
94	def test_get_testcase(self):	102		def test_get_testcase(self):
95	self.test_create_testcase()	103		self.test_create_testcase()
96		104
97	r = self.app.get('/api/v1.0/testcases/%s' % self.ref_testcase_name, content_type='application/json')	105		r = self.app.get('/api/v1.0/testcases/%s' % self.ref_testcase_name)
98		106
99	data = json.loads(r.data)	107		data = json.loads(r.data)
100		108
101	assert r.status_code == 200	109		assert r.status_code == 200
102	assert data['name'] == self.ref_testcase_name	110		assert data['name'] == self.ref_testcase_name
103	assert data['url'] == self.ref_testcase_url	111		assert data['url'] == self.ref_testcase_url
104		112
105	def test_get_invalid_testcase(self):	113		def test_get_invalid_testcase(self):
106	r = self.app.get('/api/v1.0/testcases/%s' % self.ref_testcase_name, content_type='application/json')	114		r = self.app.get('/api/v1.0/testcases/%s' % self.ref_testcase_name)
107		115
108	data = json.loads(r.data)	116		data = json.loads(r.data)
109		117
110	assert r.status_code == 404	118		assert r.status_code == 404
111	assert data['message'] == "Testcase not found"	119		assert data['message'] == "Testcase not found"
112		120
113	def test_get_testcases(self):	121		def test_get_testcases(self):
114	self.test_create_testcase()	122		self.test_create_testcase()
115		123
116	r = self.app.get('/api/v1.0/testcases', content_type='application/json')	124		r = self.app.get('/api/v1.0/testcases')
117		125
118	data = json.loads(r.data)	126		data = json.loads(r.data)
119		127
120	assert r.status_code == 200	128		assert r.status_code == 200
121	assert data['data'][0]['name'] == self.ref_testcase_name	129		assert data['data'][0]['name'] == self.ref_testcase_name
122	assert data['data'][0]['url'] == self.ref_testcase_url	130		assert data['data'][0]['url'] == self.ref_testcase_url
123		131
124	def test_get_empty_testcases(self):	132		def test_get_empty_testcases(self):
125	r = self.app.get('/api/v1.0/testcases', content_type='application/json')	133		r = self.app.get('/api/v1.0/testcases')
126		134
127	data = json.loads(r.data)	135		data = json.loads(r.data)
128		136
129	assert r.status_code == 200	137		assert r.status_code == 200
130	assert data['data'] == []	138		assert data['data'] == []
131		139
132	def test_create_job(self):	140		def test_create_job(self):
133	ref_data = json.dumps({'ref_url': self.ref_job_url, 'status': self.ref_status, 'name': self.ref_job_name})	141		ref_data = json.dumps({'ref_url': self.ref_job_url, 'status': self.ref_status, 'name': self.ref_job_name})
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Line(s)		201	def test_update_invalid_status_job(self):
201	data = json.loads(r.data)	209		data = json.loads(r.data)
202		210
203	assert r.status_code == 400	211		assert r.status_code == 400
204	assert data['message'].startswith("status must be one of")	212		assert data['message'].startswith("status must be one of")
205		213
206	def test_get_job(self):	214		def test_get_job(self):
207	self.test_create_job()	215		self.test_create_job()
208		216
209	r = self.app.get('/api/v1.0/jobs/%d' % self.ref_job_id, content_type='application/json')	217		r = self.app.get('/api/v1.0/jobs/%d' % self.ref_job_id)
210		218
211	data = json.loads(r.data)	219		data = json.loads(r.data)
212		220
213	assert r.status_code == 200	221		assert r.status_code == 200
214	assert data['id'] == self.ref_job_id	222		assert data['id'] == self.ref_job_id
215	assert data['status'] == self.ref_status	223		assert data['status'] == self.ref_status
216		224
217	def test_get_invalid_job(self):	225		def test_get_invalid_job(self):
218	r = self.app.get('/api/v1.0/jobs/%d' % self.ref_job_id, content_type='application/json')	226		r = self.app.get('/api/v1.0/jobs/%d' % self.ref_job_id)
219		227
220	data = json.loads(r.data)	228		data = json.loads(r.data)
221		229
222	assert r.status_code == 404	230		assert r.status_code == 404
223	assert data['message'] == "Job not found"	231		assert data['message'] == "Job not found"
224		232
225	def test_get_jobs(self):	233		def test_get_jobs(self):
226	self.test_create_job()	234		self.test_create_job()
227		235
228	r = self.app.get('/api/v1.0/jobs', content_type='application/json')	236		r = self.app.get('/api/v1.0/jobs')
229		237
230	data = json.loads(r.data)	238		data = json.loads(r.data)
231		239
232	assert r.status_code == 200	240		assert r.status_code == 200
233	assert data['data'][0]['id'] == self.ref_job_id	241		assert data['data'][0]['id'] == self.ref_job_id
234	assert data['data'][0]['status'] == self.ref_status	242		assert data['data'][0]['status'] == self.ref_status
235		243
236	def test_get_jobs_params(self):	244		def test_get_jobs_params(self):
237	self.test_create_job()	245		self.test_create_job()
238		246
239	ref_data = json.dumps({'page': 0,	247		ref_data = json.dumps({'page': 0,
240	'limit': 10,	248		'limit': 10,
241	'status': self.ref_status,	249		'status': self.ref_status,
242	'since': datetime.datetime(1970, 1, 1).isoformat(' ')})	250		'since': datetime.datetime(1970, 1, 1).isoformat(' ')})
243		251
244	r = self.app.get('/api/v1.0/jobs', data=ref_data, content_type='application/json')	252		r = self.app.get('/api/v1.0/jobs', data=ref_data)
245		253
246	data = json.loads(r.data)	254		data = json.loads(r.data)
247		255
248	assert r.status_code == 200	256		assert r.status_code == 200
249	assert data['data'][0]['id'] == self.ref_job_id	257		assert data['data'][0]['id'] == self.ref_job_id
250	assert data['data'][0]['status'] == self.ref_status	258		assert data['data'][0]['status'] == self.ref_status
251		259
252	def test_get_empty_jobs(self):	260		def test_get_empty_jobs(self):
253	r = self.app.get('/api/v1.0/jobs', content_type='application/json')	261		r = self.app.get('/api/v1.0/jobs')
254		262
255	data = json.loads(r.data)	263		data = json.loads(r.data)
256		264
257	assert r.status_code == 200	265		assert r.status_code == 200
258	assert data['data'] == []	266		assert data['data'] == []
259		267
260	def test_create_result(self):	268		def test_create_result(self):
261	self.test_create_testcase()	269		self.test_create_testcase()
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)		316	def test_create_invalid_result(self):
316	data = json.loads(r.data)	324		data = json.loads(r.data)
317		325
318	assert r.status_code == 400	326		assert r.status_code == 400
319	assert data['message'] == "Job not running"	327		assert data['message'] == "Job not running"
320		328
321	def test_get_result(self):	329		def test_get_result(self):
322	self.test_create_result()	330		self.test_create_result()
323		331
324	r = self.app.get('/api/v1.0/results/%d' % self.ref_result_id, content_type='application/json')	332		r = self.app.get('/api/v1.0/results/%d' % self.ref_result_id)
325		333
326	data = json.loads(r.data)	334		data = json.loads(r.data)
327		335
328	assert r.status_code == 200	336		assert r.status_code == 200
329	assert data['outcome'] == self.ref_outcome	337		assert data['outcome'] == self.ref_outcome
330	assert data['id'] == self.ref_job_id	338		assert data['id'] == self.ref_job_id
331	assert data['testcase']['name'] == self.ref_testcase_name	339		assert data['testcase']['name'] == self.ref_testcase_name
332		340
333	def test_get_invalid_result(self):	341		def test_get_invalid_result(self):
334	r = self.app.get('/api/v1.0/results/%d' % self.ref_result_id, content_type='application/json')	342		r = self.app.get('/api/v1.0/results/%d' % self.ref_result_id)
335		343
336	data = json.loads(r.data)	344		data = json.loads(r.data)
337		345
338	assert r.status_code == 404	346		assert r.status_code == 404
339	assert data['message'] == "Result not found"	347		assert data['message'] == "Result not found"
340		348
341	def test_get_results(self):	349		def test_get_results(self):
342	self.test_create_result()	350		self.test_create_result()
343		351
344	r = self.app.get('/api/v1.0/results', content_type='application/json')	352		r = self.app.get('/api/v1.0/results')
345		353
346	data = json.loads(r.data)	354		data = json.loads(r.data)
347		355
348	assert r.status_code == 200	356		assert r.status_code == 200
349	assert data['data'][0]['outcome'] == self.ref_outcome	357		assert data['data'][0]['outcome'] == self.ref_outcome
350	assert data['data'][0]['id'] == self.ref_job_id	358		assert data['data'][0]['id'] == self.ref_job_id
351	assert data['data'][0]['testcase']['name'] == self.ref_testcase_name	359		assert data['data'][0]['testcase']['name'] == self.ref_testcase_name
352		360
353	def test_get_empty_results(self):	361		def test_get_empty_results(self):
354	r = self.app.get('/api/v1.0/results', content_type='application/json')	362		r = self.app.get('/api/v1.0/results')
355		363
356	data = json.loads(r.data)	364		data = json.loads(r.data)
357		365
358	assert r.status_code == 200	366		assert r.status_code == 200
359	assert data['data'] == []	367		assert data['data'] == []
360		368
361	def test_get_testcases_results(self):	369		def test_get_testcases_results(self):
362	self.test_create_result()	370		self.test_create_result()
363		371
364	r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name, content_type='application/json')	372		r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name)
365		373
366	data = json.loads(r.data)	374		data = json.loads(r.data)
367		375
368	assert r.status_code == 200	376		assert r.status_code == 200
369	assert data['data'][0]['outcome'] == self.ref_outcome	377		assert data['data'][0]['outcome'] == self.ref_outcome
370	assert data['data'][0]['id'] == self.ref_job_id	378		assert data['data'][0]['id'] == self.ref_job_id
371	assert data['data'][0]['testcase']['name'] == self.ref_testcase_name	379		assert data['data'][0]['testcase']['name'] == self.ref_testcase_name
372		380
373	def test_get_testcases_empty_results(self):	381		def test_get_testcases_empty_results(self):
374	r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name, content_type='application/json')	382		r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name)
375		383
376	data = json.loads(r.data)	384		data = json.loads(r.data)
377		385
378	assert r.status_code == 404	386		assert r.status_code == 404
379	assert data['message'] == "Testcase not found"	387		assert data['message'] == "Testcase not found"
380		388
381	def test_get_jobs_results(self):	389		def test_get_jobs_results(self):
382	self.test_create_result()	390		self.test_create_result()
383		391
384	r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name, content_type='application/json')	392		r = self.app.get('/api/v1.0/testcases/%s/results' % self.ref_testcase_name)
385		393
386	data = json.loads(r.data)	394		data = json.loads(r.data)
387		395
388	assert r.status_code == 200	396		assert r.status_code == 200
389	assert data['data'][0]['outcome'] == self.ref_outcome	397		assert data['data'][0]['outcome'] == self.ref_outcome
390	assert data['data'][0]['id'] == self.ref_job_id	398		assert data['data'][0]['id'] == self.ref_job_id
391	assert data['data'][0]['testcase']['name'] == self.ref_testcase_name	399		assert data['data'][0]['testcase']['name'] == self.ref_testcase_name
392		400
393	def test_get_jobs_empty_results(self):	401		def test_get_jobs_empty_results(self):
394	r = self.app.get('/api/v1.0/jobs/%s/results' % self.ref_job_id, content_type='application/json')	402		r = self.app.get('/api/v1.0/jobs/%s/results' % self.ref_job_id)
395		403
396	data = json.loads(r.data)	404		data = json.loads(r.data)
397		405
398	assert r.status_code == 404	406		assert r.status_code == 404
399	assert data['message'] == "Job not found"	407		assert data['message'] == "Job not found"
400		408
401	def test_get_jobs_results_with_jsonp(self):	409		def test_get_jobs_results_with_jsonp(self):
402	self.test_create_result()	410		self.test_create_result()
Show All 10 Lines

		Path
A	M	alembic.ini (74 lines)
A	M	alembic/env.py (80 lines)
A	M	alembic/script.py.mako (24 lines)
A	M	alembic/versions/15f5eeb9f635_initial_revision.py (28 lines)
A	M	alembic/versions/433d0b5b3b96_added_index_on_the_keyval_store.py (28 lines)
M		requirements.txt (1 line)
M		resultsdb.spec (12 lines)
M		resultsdb/cli.py (72 lines)
M		resultsdb/config.py (3 lines)
M		resultsdb/models/results.py (3 lines)
M		testing/functest_api.py (44 lines)

Initial Alembic support
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 821

alembic.ini

alembic/env.py

alembic/script.py.mako

alembic/versions/15f5eeb9f635_initial_revision.py

alembic/versions/433d0b5b3b96_added_index_on_the_keyval_store.py

requirements.txt

resultsdb.spec

resultsdb/cli.py

resultsdb/config.py

resultsdb/models/results.py

testing/functest_api.py

Initial Alembic supportClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 821

alembic.ini

alembic/env.py

alembic/script.py.mako

alembic/versions/15f5eeb9f635_initial_revision.py

alembic/versions/433d0b5b3b96_added_index_on_the_keyval_store.py

requirements.txt

resultsdb.spec

resultsdb/cli.py

resultsdb/config.py

resultsdb/models/results.py

testing/functest_api.py

Initial Alembic support
ClosedPublic
Actions