Re-architect the RepoFlags class

We don't need to create flags - just read and parse them from
the project meta config. Remove the unneeded functionality and
enhance the structure. All flags from a project and package
are accessible via a single RepoFlags object.

2 files changed, 25 insertions, 96 deletions

diff --git a/test/test_api.py b/test/test_api.py
index c8e40b2..5769543 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -357,24 +357,31 @@ def test_get_binary_fileinfo(requests_mock, binary_fileinfo):
     assert bfinfo.requires == [p.text for p in expected_bfinfo.findall('requires')]
 
 
-def check_get_repo_flags(flag_type, prj, pkg, expected):
-    repo_flags = api.get_repo_flags(flag_type, prj, pkg)
-    assert repo_flags.flag_type == flag_type
-    assert len(list(repo_flags.flags)) == expected
-
-
-def test_get_project_repo_build_flags(requests_mock, project_meta):
+def test_get_project_flags(requests_mock, project_meta):
     matcher = prj_meta_re
     requests_mock.get(matcher, text=project_meta)
-    check_get_repo_flags('build', prj, None, 0)
+    repoflags = api.get_repo_flags(prj)
+    assert repoflags.flag_types == set()
 
 
-def test_get_package_repo_build_flags(requests_mock, package_meta):
+def test_get_package_repo_flags(requests_mock, package_meta):
     matcher = pkg_meta_re
     requests_mock.get(matcher, text=package_meta)
+    repoflags = api.get_repo_flags(prj, pkg)
+    assert repoflags.flag_types == {'build', 'debuginfo', 'useforbuild'}
     meta = etree.fromstring(package_meta)
-    expected_repoflags = meta.find('build')
-    check_get_repo_flags('build', prj, pkg, len(expected_repoflags))
+    for element in meta:
+        for sub in element:
+            if sub.tag in ['enable', 'disable']:
+                flag = element.tag
+                status = sub.tag
+                repository = sub.get('repository', None)
+                arch = sub.get('arch', None)
+                match = False
+                for flag in repoflags.get_flag(flag):
+                    if flag.status == status and flag.repository == repository and flag.arch == arch:
+                        match = True
+                assert match
 
 
 @pytest.mark.parametrize('target', ('project', 'package'))
diff --git a/test/test_repo_flags.py b/test/test_repo_flags.py
index 8219eef..d9b8642 100644
--- a/test/test_repo_flags.py
+++ b/test/test_repo_flags.py
@@ -34,88 +34,10 @@ xml2 = """<package name="suse-hello-1.0" project="home:sbahling:obsapi:test">
 flag_types = ['build', 'publish', 'useforbuild', 'debuginfo']
 
 
-def test_repo_flags_default_type():
-    repo_flags = RepoFlags()
-    assert repo_flags.flag_type == 'build'
-
-
-@pytest.mark.parametrize('flag_type', flag_types)
-def test_repo_flags_flag_type(flag_type):
-    repo_flags = RepoFlags(flag_type)
-    assert repo_flags.flag_type == flag_type
-    assert repo_flags.root.tag == flag_type
-
-
-def test_repo_flags_invalid_flag_type():
-    with pytest.raises(ValueError):
-        RepoFlags('invalid')
-
-
-def test_repo_flags_pass_xml_without_flags():
-    repo_flags = RepoFlags(xml=xml1)
-    assert repo_flags.flag_type == 'build'
-
-
-def test_repo_flags_pass_xml_with_flags():
-    repo_flags = RepoFlags(xml=xml2)
-    assert repo_flags.flag_type in flag_types
-
-
-def test_repo_flags_xml_build_flags():
-    repo_flags = RepoFlags('build', xml=xml2)
-    assert repo_flags.flag_type == 'build'
-    for flag in repo_flags.flags:
-        if flag.status == 'enable':
-            assert flag.repository == 'SLE_12_SP3'
-            assert flag.arch == 'x86_64'
-        if flag.status == 'disable':
-            assert flag.repository is None
-            assert flag.arch is None
-
-
-def test_repo_flags_xml_debuginfo_flags():
-    repo_flags = RepoFlags('debuginfo', xml=xml2)
-    assert repo_flags.flag_type == 'debuginfo'
-    for flag in repo_flags.flags:
-        if flag.status == 'enable':
-            assert flag.repository is None
-            assert flag.arch is None
-
-
-def test_repo_flags_xml_new_flags():
-    repo_flags = RepoFlags('publish', xml=xml2)
-    assert repo_flags.flag_type == 'publish'
-    assert len(list(repo_flags.flags)) == 0
-
-
-params = [('useforbuild', 'SLE_15_SP1', 'x86_64'),
-          ('publish', None, None),
-          ('debuginfo', None, 'aarch64'),
-          ('build', 'SLE_12_SP3', None)
-          ]
-
-
-@pytest.mark.parametrize('flag_type, repo, arch', params)
-def test_repo_flags_enable(flag_type, repo, arch):
-    repoflags = RepoFlags(flag_type)
-    repoflags.enable(repo=repo, arch=arch)
-    for flag in repoflags.flags:
-        assert flag.status == 'enable'
-        assert flag.repository == repo
-        assert flag.arch == arch
-
-
-@pytest.mark.parametrize('flag_type, repo, arch', params)
-def test_repo_flags_disable(flag_type, repo, arch):
-    repoflags = RepoFlags(flag_type)
-    repoflags.disable(repo=repo, arch=arch)
-    for flag in repoflags.flags:
-        assert flag.status == 'disable'
-        assert flag.repository == repo
-        assert flag.arch == arch
-
-
-def test_repo_flags_set_invalid():
-    repoflags = RepoFlags()
-    with pytest.raises(ValueError):
-        repoflags.set('invalid')
+def test_flag_types():
+    repoflags = RepoFlags(xml2)
+    flag_types = repoflags.flag_types
+    assert len(flag_types) == 3
+    assert 'build' in flag_types
+    assert 'useforbuild' in flag_types
+    assert 'debuginfo' in flag_types