summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Bahling <sbahling@suse.com>2020-02-03 12:57:22 +0100
committerScott Bahling <sbahling@suse.com>2020-02-03 12:57:22 +0100
commit6eb3d336cdcc06078cd2629be5e2cbabae29eff6 (patch)
treed47496e0ec8da2d25e8af6af4ebae7129f7c794a
parent001524aa8f7e9e9def363b535baf13bfd76a9f86 (diff)
downloadobsapi-6eb3d336cdcc06078cd2629be5e2cbabae29eff6.tar.gz
obsapi-6eb3d336cdcc06078cd2629be5e2cbabae29eff6.tar.xz
obsapi-6eb3d336cdcc06078cd2629be5e2cbabae29eff6.zip
Use status instead of setting to be consistent with the api
-rw-r--r--obsapi/repoflags.py14
-rw-r--r--test/test_repo_flags.py10
2 files changed, 12 insertions, 12 deletions
diff --git a/obsapi/repoflags.py b/obsapi/repoflags.py
index ffea5e6..3689711 100644
--- a/obsapi/repoflags.py
+++ b/obsapi/repoflags.py
@@ -3,7 +3,7 @@ from lxml import etree
from collections import namedtuple
-RepoFlag = namedtuple('RepoFlag', 'setting repository arch')
+RepoFlag = namedtuple('RepoFlag', 'status repository arch')
valid_flag_types = ('build', 'publish', 'useforbuild', 'debuginfo')
if sys.version_info >= (3, 0):
@@ -84,16 +84,16 @@ class RepoFlags():
for element in self.root:
if element.tag not in ['enable', 'disable']:
continue
- setting = element.tag
+ status = element.tag
repo = element.get('repository', None)
arch = element.get('arch', None)
- yield(RepoFlag(setting=setting, repository=repo, arch=arch))
+ yield(RepoFlag(status=status, repository=repo, arch=arch))
- def set(self, setting, repo=None, arch=None):
- if setting not in ['enable', 'disable']:
- raise ValueError('Invalid Flag Setting %s' % setting)
+ def set(self, status, repo=None, arch=None):
+ if status not in ['enable', 'disable']:
+ raise ValueError('Invalid Flag status %s' % status)
- element = etree.Element(setting)
+ element = etree.Element(status)
if repo:
element.set('repository', repo)
if arch:
diff --git a/test/test_repo_flags.py b/test/test_repo_flags.py
index 290a106..8219eef 100644
--- a/test/test_repo_flags.py
+++ b/test/test_repo_flags.py
@@ -65,10 +65,10 @@ 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.setting == 'enable':
+ if flag.status == 'enable':
assert flag.repository == 'SLE_12_SP3'
assert flag.arch == 'x86_64'
- if flag.setting == 'disable':
+ if flag.status == 'disable':
assert flag.repository is None
assert flag.arch is None
@@ -77,7 +77,7 @@ 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.setting == 'enable':
+ if flag.status == 'enable':
assert flag.repository is None
assert flag.arch is None
@@ -100,7 +100,7 @@ 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.setting == 'enable'
+ assert flag.status == 'enable'
assert flag.repository == repo
assert flag.arch == arch
@@ -110,7 +110,7 @@ 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.setting == 'disable'
+ assert flag.status == 'disable'
assert flag.repository == repo
assert flag.arch == arch