From 62412c21c2e5e484cf87d68fcb9fdac39a834e82 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Nov 21 2019 09:00:48 +0000 Subject: Install subject types to /etc/greenwave/subject_types JIRA: FACTORY-5574 Signed-off-by: Lukas Holecek --- diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py index 944aef5..30115c2 100644 --- a/functional-tests/test_api_v1.py +++ b/functional-tests/test_api_v1.py @@ -1508,3 +1508,18 @@ def test_make_a_decision_on_demand_policy( assert len(res_data['satisfied_requirements']) == len(results) assert len(res_data['unsatisfied_requirements']) == 0 + + +@pytest.mark.smoke +def test_installed_subject_types(requests_session, greenwave_server): + response = requests_session.get(greenwave_server + 'api/v1.0/subject_types') + assert response.status_code == 200 + data = response.json() + assert len(data['subject_types']) + assert [x['id'] for x in data['subject_types']] == [ + 'bodhi_update', + 'compose', + 'koji_build', + 'redhat-container-image', + 'redhat-module', + ] diff --git a/setup.py b/setup.py index 989a62f..fec2325 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # SPDX-License-Identifier: GPL-2.0+ +import glob import os import re from setuptools import setup, find_packages @@ -98,6 +99,8 @@ setup( resultsdb = greenwave.consumers.resultsdb:ResultsDBHandler waiverdb = greenwave.consumers.waiverdb:WaiverDBHandler """, - data_files=[('/etc/fedmsg.d/', ['fedmsg.d/resultsdb.py', - 'fedmsg.d/waiverdb.py'])] + data_files=[ + ('/etc/fedmsg.d/', ['fedmsg.d/resultsdb.py', 'fedmsg.d/waiverdb.py']), + ('/etc/greenwave/subject_types/', glob.glob('conf/subject_types/*')), + ] )