#522 Install subject types to /etc/greenwave/subject_types
Merged 4 years ago by gnaponie. Opened 4 years ago by lholecek.
lholecek/greenwave install-subject-types  into  master

@@ -1508,3 +1508,18 @@ 

  

      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',

+     ]

file modified
+5 -2
@@ -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 @@ 

      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/*')),

+     ]

  )

JIRA: FACTORY-5574
Signed-off-by: Lukas Holecek hluk@email.cz

rebased onto 62412c2

4 years ago

Pull-Request has been merged by gnaponie

4 years ago