Merge pull request 'Fix merge points creating a cross' (#15) from debug_firewalld into main
Reviewed-on: https://gitea.opensuse.org/importers/git-importer/pulls/15
This commit is contained in:
coolo
commit
651bd94771
@ -31,6 +31,7 @@ class DBRevision:
|
||||
self.rev = float(self.rev)
|
||||
self._files = None
|
||||
self.db = db
|
||||
self.git_commit = None
|
||||
|
||||
def short_string(self):
|
||||
return f"{self.project}/{self.package}/{self.rev}"
|
||||
|
||||
@ -107,10 +107,12 @@ class GitExporter:
|
||||
if flat.parent1:
|
||||
if not self.branch_fits_parent1(flat, branch_state):
|
||||
logging.info(f"Reset {flat.branch} onto {flat.parent1.short_string()}")
|
||||
assert flat.parent1.git_commit
|
||||
self.git.set_branch_head(flat.branch, flat.parent1.git_commit)
|
||||
self.git.checkout(flat.branch)
|
||||
parents.append(flat.parent1.git_commit)
|
||||
if flat.parent2:
|
||||
assert flat.parent2.git_commit
|
||||
parents.append(flat.parent2.git_commit)
|
||||
|
||||
# Overwrite ".gitattributes" with the
|
||||
|
||||
@ -104,14 +104,24 @@ class TreeBuilder:
|
||||
"""For a given revision in the target, find the node in the source chain
|
||||
that matches the files"""
|
||||
node = source_chain
|
||||
candidates = []
|
||||
while node:
|
||||
# exclude reverts happening after the merge
|
||||
if (
|
||||
node.revision.commit_time <= revision.commit_time
|
||||
and node.revision.files_hash == revision.files_hash
|
||||
):
|
||||
return node
|
||||
candidates.append(node)
|
||||
if node.merged_into:
|
||||
# we can't have candidates that are crossing previous merges
|
||||
# see https://gitea.opensuse.org/importers/git-importer/issues/14
|
||||
candidates = []
|
||||
node = node.parent
|
||||
if candidates:
|
||||
# the first candidate is the youngest one that matches the check. That's
|
||||
# good enough. See FastCGI test case for rev 36 and 38: 37 reverted 36 and
|
||||
# then 38 reverting the revert before it was submitted.
|
||||
return candidates[0]
|
||||
|
||||
def add_merge_points(self, factory_revisions):
|
||||
"""For all target revisions that accepted a request, look up the merge
|
||||
|
||||
4528
tests/fixtures/FastCGI-data.yaml
vendored
Normal file
4528
tests/fixtures/FastCGI-data.yaml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
33
tests/fixtures/FastCGI-expected-list.yaml
vendored
Normal file
33
tests/fixtures/FastCGI-expected-list.yaml
vendored
Normal file
@ -0,0 +1,33 @@
|
||||
- factory c:openSUSE:Factory/FastCGI/29.0 p1:openSUSE:Factory/FastCGI/28.0 p2:devel:libraries:c_c++/FastCGI/40.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/40.0 p1:devel:libraries:c_c++/FastCGI/38.0
|
||||
- factory c:openSUSE:Factory/FastCGI/28.0 p1:openSUSE:Factory/FastCGI/27.0 p2:devel:libraries:c_c++/FastCGI/38.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/38.0 p1:devel:libraries:c_c++/FastCGI/37.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/37.0 p1:devel:libraries:c_c++/FastCGI/36.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/36.0 p1:devel:libraries:c_c++/FastCGI/34.0
|
||||
- factory c:openSUSE:Factory/FastCGI/27.0 p1:openSUSE:Factory/FastCGI/26.0 p2:devel:libraries:c_c++/FastCGI/34.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/34.0 p1:devel:libraries:c_c++/FastCGI/32.0
|
||||
- factory c:openSUSE:Factory/FastCGI/26.0 p1:openSUSE:Factory/FastCGI/23.0 p2:devel:libraries:c_c++/FastCGI/32.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/32.0 p1:devel:libraries:c_c++/FastCGI/30.0
|
||||
- factory c:openSUSE:Factory/FastCGI/23.0 p1:openSUSE:Factory/FastCGI/20.0 p2:devel:libraries:c_c++/FastCGI/30.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/30.0 p1:devel:libraries:c_c++/FastCGI/28.0
|
||||
- factory c:openSUSE:Factory/FastCGI/20.0 p1:openSUSE:Factory/FastCGI/19.0 p2:devel:libraries:c_c++/FastCGI/28.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/28.0 p1:devel:libraries:c_c++/FastCGI/26.0
|
||||
- factory c:openSUSE:Factory/FastCGI/19.0 p1:openSUSE:Factory/FastCGI/18.0 p2:devel:libraries:c_c++/FastCGI/26.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/26.0 p1:devel:libraries:c_c++/FastCGI/24.0
|
||||
- factory c:openSUSE:Factory/FastCGI/18.0 p1:openSUSE:Factory/FastCGI/16.0 p2:devel:libraries:c_c++/FastCGI/24.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/24.0 p1:devel:libraries:c_c++/FastCGI/22.0
|
||||
- factory c:openSUSE:Factory/FastCGI/16.0 p1:openSUSE:Factory/FastCGI/15.0 p2:devel:libraries:c_c++/FastCGI/22.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/22.0 p1:devel:libraries:c_c++/FastCGI/20.0
|
||||
- factory c:openSUSE:Factory/FastCGI/15.0 p1:openSUSE:Factory/FastCGI/14.0 p2:devel:libraries:c_c++/FastCGI/20.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/20.0 p1:devel:libraries:c_c++/FastCGI/19.014
|
||||
- devel c:devel:libraries:c_c++/FastCGI/19.014 p1:devel:libraries:c_c++/FastCGI/18.0
|
||||
- factory c:openSUSE:Factory/FastCGI/14.0 p1:openSUSE:Factory/FastCGI/13.0
|
||||
- factory c:openSUSE:Factory/FastCGI/13.0 p1:openSUSE:Factory/FastCGI/11.0 p2:devel:libraries:c_c++/FastCGI/18.0
|
||||
- devel c:devel:libraries:c_c++/FastCGI/18.0 p1:openSUSE:Factory/FastCGI/11.0
|
||||
- factory c:openSUSE:Factory/FastCGI/11.0 p1:openSUSE:Factory/FastCGI/10.0
|
||||
- factory c:openSUSE:Factory/FastCGI/10.0 p1:openSUSE:Factory/FastCGI/7.0
|
||||
- factory c:openSUSE:Factory/FastCGI/7.0 p1:openSUSE:Factory/FastCGI/6.0
|
||||
- factory c:openSUSE:Factory/FastCGI/6.0 p1:openSUSE:Factory/FastCGI/4.0
|
||||
- factory c:openSUSE:Factory/FastCGI/4.0 p1:openSUSE:Factory/FastCGI/3.0
|
||||
- factory c:openSUSE:Factory/FastCGI/3.0 p1:openSUSE:Factory/FastCGI/1.0
|
||||
- factory c:openSUSE:Factory/FastCGI/1.0
|
||||
44
tests/fixtures/FastCGI-expected-tree.yaml
vendored
Normal file
44
tests/fixtures/FastCGI-expected-tree.yaml
vendored
Normal file
@ -0,0 +1,44 @@
|
||||
- commit: openSUSE:Factory/FastCGI/29.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/40.0
|
||||
- commit: openSUSE:Factory/FastCGI/28.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/38.0
|
||||
- devel:libraries:c_c++/FastCGI/37.0
|
||||
- devel:libraries:c_c++/FastCGI/36.0
|
||||
- commit: openSUSE:Factory/FastCGI/27.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/34.0
|
||||
- commit: openSUSE:Factory/FastCGI/26.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/32.0
|
||||
- commit: openSUSE:Factory/FastCGI/23.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/30.0
|
||||
- commit: openSUSE:Factory/FastCGI/20.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/28.0
|
||||
- commit: openSUSE:Factory/FastCGI/19.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/26.0
|
||||
- commit: openSUSE:Factory/FastCGI/18.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/24.0
|
||||
- commit: openSUSE:Factory/FastCGI/16.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/22.0
|
||||
- commit: openSUSE:Factory/FastCGI/15.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/20.0
|
||||
- devel:libraries:c_c++/FastCGI/19.014
|
||||
- commit: openSUSE:Factory/FastCGI/14.0
|
||||
- commit: openSUSE:Factory/FastCGI/13.0
|
||||
merged:
|
||||
- devel:libraries:c_c++/FastCGI/18.0
|
||||
- commit: openSUSE:Factory/FastCGI/11.0
|
||||
- commit: openSUSE:Factory/FastCGI/10.0
|
||||
- commit: openSUSE:Factory/FastCGI/7.0
|
||||
- commit: openSUSE:Factory/FastCGI/6.0
|
||||
- commit: openSUSE:Factory/FastCGI/4.0
|
||||
- commit: openSUSE:Factory/FastCGI/3.0
|
||||
- commit: openSUSE:Factory/FastCGI/1.0
|
||||
9551
tests/fixtures/firewalld-data.yaml
vendored
Normal file
9551
tests/fixtures/firewalld-data.yaml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
173
tests/fixtures/firewalld-expected-list.yaml
vendored
Normal file
173
tests/fixtures/firewalld-expected-list.yaml
vendored
Normal file
@ -0,0 +1,173 @@
|
||||
- factory c:openSUSE:Factory/firewalld/73.0 p1:openSUSE:Factory/firewalld/72.0 p2:security:netfilter/firewalld/131.0
|
||||
- devel c:security:netfilter/firewalld/131.0 p1:security:netfilter/firewalld/129.0
|
||||
- factory c:openSUSE:Factory/firewalld/72.0 p1:openSUSE:Factory/firewalld/71.0 p2:security:netfilter/firewalld/129.0
|
||||
- devel c:security:netfilter/firewalld/129.0 p1:security:netfilter/firewalld/128.0
|
||||
- devel c:security:netfilter/firewalld/128.0 p1:security:netfilter/firewalld/127.0
|
||||
- factory c:openSUSE:Factory/firewalld/71.0 p1:openSUSE:Factory/firewalld/70.0 p2:security:netfilter/firewalld/127.0
|
||||
- devel c:security:netfilter/firewalld/127.0 p1:security:netfilter/firewalld/126.0
|
||||
- factory c:openSUSE:Factory/firewalld/70.0 p1:openSUSE:Factory/firewalld/69.0
|
||||
- factory c:openSUSE:Factory/firewalld/69.0 p1:openSUSE:Factory/firewalld/68.0 p2:security:netfilter/firewalld/126.0
|
||||
- devel c:security:netfilter/firewalld/126.0 p1:security:netfilter/firewalld/125.0
|
||||
- factory c:openSUSE:Factory/firewalld/68.0 p1:openSUSE:Factory/firewalld/67.0 p2:security:netfilter/firewalld/125.0
|
||||
- devel c:security:netfilter/firewalld/125.0 p1:security:netfilter/firewalld/124.0
|
||||
- factory c:openSUSE:Factory/firewalld/67.0 p1:openSUSE:Factory/firewalld/66.0 p2:security:netfilter/firewalld/124.0
|
||||
- devel c:security:netfilter/firewalld/124.0 p1:security:netfilter/firewalld/123.0
|
||||
- factory c:openSUSE:Factory/firewalld/66.0 p1:openSUSE:Factory/firewalld/65.0 p2:security:netfilter/firewalld/123.0
|
||||
- devel c:security:netfilter/firewalld/123.0 p1:security:netfilter/firewalld/122.0
|
||||
- factory c:openSUSE:Factory/firewalld/65.0 p1:openSUSE:Factory/firewalld/64.0 p2:security:netfilter/firewalld/122.0
|
||||
- devel c:security:netfilter/firewalld/122.0 p1:security:netfilter/firewalld/121.0
|
||||
- factory c:openSUSE:Factory/firewalld/64.0 p1:openSUSE:Factory/firewalld/63.0 p2:security:netfilter/firewalld/121.0
|
||||
- devel c:security:netfilter/firewalld/121.0 p1:security:netfilter/firewalld/120.0
|
||||
- factory c:openSUSE:Factory/firewalld/63.0 p1:openSUSE:Factory/firewalld/62.0 p2:security:netfilter/firewalld/120.0
|
||||
- devel c:security:netfilter/firewalld/120.0 p1:security:netfilter/firewalld/119.0
|
||||
- factory c:openSUSE:Factory/firewalld/62.0 p1:openSUSE:Factory/firewalld/61.0 p2:security:netfilter/firewalld/119.0
|
||||
- devel c:security:netfilter/firewalld/119.0 p1:security:netfilter/firewalld/118.0
|
||||
- factory c:openSUSE:Factory/firewalld/61.0 p1:openSUSE:Factory/firewalld/60.0 p2:security:netfilter/firewalld/118.0
|
||||
- devel c:security:netfilter/firewalld/118.0 p1:security:netfilter/firewalld/117.0
|
||||
- factory c:openSUSE:Factory/firewalld/60.0 p1:openSUSE:Factory/firewalld/59.0 p2:security:netfilter/firewalld/117.0
|
||||
- devel c:security:netfilter/firewalld/117.0 p1:security:netfilter/firewalld/116.0
|
||||
- factory c:openSUSE:Factory/firewalld/59.0 p1:openSUSE:Factory/firewalld/58.0 p2:security:netfilter/firewalld/116.0
|
||||
- devel c:security:netfilter/firewalld/116.0 p1:security:netfilter/firewalld/115.0
|
||||
- factory c:openSUSE:Factory/firewalld/58.0 p1:openSUSE:Factory/firewalld/57.0 p2:security:netfilter/firewalld/115.0
|
||||
- devel c:security:netfilter/firewalld/115.0 p1:security:netfilter/firewalld/114.0
|
||||
- factory c:openSUSE:Factory/firewalld/57.0 p1:openSUSE:Factory/firewalld/56.0 p2:security:netfilter/firewalld/114.0
|
||||
- devel c:security:netfilter/firewalld/114.0 p1:security:netfilter/firewalld/113.0
|
||||
- factory c:openSUSE:Factory/firewalld/56.0 p1:openSUSE:Factory/firewalld/55.0 p2:security:netfilter/firewalld/113.0
|
||||
- devel c:security:netfilter/firewalld/113.0 p1:security:netfilter/firewalld/112.0
|
||||
- factory c:openSUSE:Factory/firewalld/55.0 p1:openSUSE:Factory/firewalld/54.0 p2:security:netfilter/firewalld/112.0
|
||||
- devel c:security:netfilter/firewalld/112.0 p1:security:netfilter/firewalld/111.0
|
||||
- devel c:security:netfilter/firewalld/111.0 p1:security:netfilter/firewalld/110.0
|
||||
- devel c:security:netfilter/firewalld/110.0 p1:security:netfilter/firewalld/109.0
|
||||
- devel c:security:netfilter/firewalld/109.0 p1:security:netfilter/firewalld/108.0
|
||||
- factory c:openSUSE:Factory/firewalld/54.0 p1:openSUSE:Factory/firewalld/53.0 p2:security:netfilter/firewalld/108.0
|
||||
- devel c:security:netfilter/firewalld/108.0 p1:security:netfilter/firewalld/107.0
|
||||
- factory c:openSUSE:Factory/firewalld/53.0 p1:openSUSE:Factory/firewalld/52.0 p2:security:netfilter/firewalld/107.0
|
||||
- devel c:security:netfilter/firewalld/107.0 p1:security:netfilter/firewalld/106.0
|
||||
- factory c:openSUSE:Factory/firewalld/52.0 p1:openSUSE:Factory/firewalld/51.0
|
||||
- factory c:openSUSE:Factory/firewalld/51.0 p1:openSUSE:Factory/firewalld/50.0
|
||||
- factory c:openSUSE:Factory/firewalld/50.0 p1:openSUSE:Factory/firewalld/49.0 p2:security:netfilter/firewalld/106.0
|
||||
- devel c:security:netfilter/firewalld/106.0 p1:security:netfilter/firewalld/105.0
|
||||
- factory c:openSUSE:Factory/firewalld/49.0 p1:openSUSE:Factory/firewalld/48.0 p2:security:netfilter/firewalld/105.0
|
||||
- devel c:security:netfilter/firewalld/105.0 p1:security:netfilter/firewalld/104.0
|
||||
- devel c:security:netfilter/firewalld/104.0 p1:security:netfilter/firewalld/103.0
|
||||
- devel c:security:netfilter/firewalld/103.0 p1:security:netfilter/firewalld/102.0
|
||||
- factory c:openSUSE:Factory/firewalld/48.0 p1:openSUSE:Factory/firewalld/47.0 p2:security:netfilter/firewalld/102.0
|
||||
- devel c:security:netfilter/firewalld/102.0 p1:security:netfilter/firewalld/101.0
|
||||
- factory c:openSUSE:Factory/firewalld/47.0 p1:openSUSE:Factory/firewalld/46.0 p2:security:netfilter/firewalld/101.0
|
||||
- devel c:security:netfilter/firewalld/101.0 p1:security:netfilter/firewalld/100.0
|
||||
- factory c:openSUSE:Factory/firewalld/46.0 p1:openSUSE:Factory/firewalld/45.0 p2:security:netfilter/firewalld/100.0
|
||||
- devel c:security:netfilter/firewalld/100.0 p1:security:netfilter/firewalld/99.0
|
||||
- factory c:openSUSE:Factory/firewalld/45.0 p1:openSUSE:Factory/firewalld/44.0 p2:security:netfilter/firewalld/99.0
|
||||
- devel c:security:netfilter/firewalld/99.0 p1:security:netfilter/firewalld/98.0
|
||||
- factory c:openSUSE:Factory/firewalld/44.0 p1:openSUSE:Factory/firewalld/43.0 p2:security:netfilter/firewalld/98.0
|
||||
- devel c:security:netfilter/firewalld/98.0 p1:security:netfilter/firewalld/97.0
|
||||
- factory c:openSUSE:Factory/firewalld/43.0 p1:openSUSE:Factory/firewalld/42.0 p2:security:netfilter/firewalld/97.0
|
||||
- devel c:security:netfilter/firewalld/97.0 p1:security:netfilter/firewalld/96.0
|
||||
- devel c:security:netfilter/firewalld/96.0 p1:security:netfilter/firewalld/95.0
|
||||
- devel c:security:netfilter/firewalld/95.0 p1:security:netfilter/firewalld/94.0
|
||||
- devel c:security:netfilter/firewalld/94.0 p1:security:netfilter/firewalld/93.0
|
||||
- factory c:openSUSE:Factory/firewalld/42.0 p1:openSUSE:Factory/firewalld/41.0 p2:security:netfilter/firewalld/93.0
|
||||
- devel c:security:netfilter/firewalld/93.0 p1:security:netfilter/firewalld/92.0
|
||||
- factory c:openSUSE:Factory/firewalld/41.0 p1:openSUSE:Factory/firewalld/40.0 p2:security:netfilter/firewalld/92.0
|
||||
- devel c:security:netfilter/firewalld/92.0 p1:security:netfilter/firewalld/91.0
|
||||
- factory c:openSUSE:Factory/firewalld/40.0 p1:openSUSE:Factory/firewalld/39.0 p2:security:netfilter/firewalld/91.0
|
||||
- devel c:security:netfilter/firewalld/91.0 p1:security:netfilter/firewalld/90.0
|
||||
- factory c:openSUSE:Factory/firewalld/39.0 p1:openSUSE:Factory/firewalld/38.0 p2:security:netfilter/firewalld/90.0
|
||||
- devel c:security:netfilter/firewalld/90.0 p1:security:netfilter/firewalld/89.0
|
||||
- factory c:openSUSE:Factory/firewalld/38.0 p1:openSUSE:Factory/firewalld/37.0 p2:security:netfilter/firewalld/89.0
|
||||
- devel c:security:netfilter/firewalld/89.0 p1:security:netfilter/firewalld/88.0
|
||||
- factory c:openSUSE:Factory/firewalld/37.0 p1:openSUSE:Factory/firewalld/36.0 p2:security:netfilter/firewalld/88.0
|
||||
- devel c:security:netfilter/firewalld/88.0 p1:security:netfilter/firewalld/87.0
|
||||
- devel c:security:netfilter/firewalld/87.0 p1:security:netfilter/firewalld/86.0
|
||||
- devel c:security:netfilter/firewalld/86.0 p1:security:netfilter/firewalld/85.0
|
||||
- devel c:security:netfilter/firewalld/85.0 p1:security:netfilter/firewalld/84.0
|
||||
- factory c:openSUSE:Factory/firewalld/36.0 p1:openSUSE:Factory/firewalld/35.0 p2:security:netfilter/firewalld/84.0
|
||||
- devel c:security:netfilter/firewalld/84.0 p1:security:netfilter/firewalld/83.0
|
||||
- devel c:security:netfilter/firewalld/83.0 p1:security:netfilter/firewalld/82.0
|
||||
- factory c:openSUSE:Factory/firewalld/35.0 p1:openSUSE:Factory/firewalld/34.0 p2:security:netfilter/firewalld/82.0
|
||||
- devel c:security:netfilter/firewalld/82.0 p1:security:netfilter/firewalld/81.0
|
||||
- devel c:security:netfilter/firewalld/81.0 p1:security:netfilter/firewalld/80.0
|
||||
- devel c:security:netfilter/firewalld/80.0 p1:security:netfilter/firewalld/79.0
|
||||
- devel c:security:netfilter/firewalld/79.0 p1:security:netfilter/firewalld/78.0
|
||||
- devel c:security:netfilter/firewalld/78.0 p1:security:netfilter/firewalld/77.0
|
||||
- factory c:openSUSE:Factory/firewalld/34.0 p1:openSUSE:Factory/firewalld/33.0 p2:security:netfilter/firewalld/77.0
|
||||
- devel c:security:netfilter/firewalld/77.0 p1:security:netfilter/firewalld/76.0
|
||||
- devel c:security:netfilter/firewalld/76.0 p1:security:netfilter/firewalld/75.0
|
||||
- devel c:security:netfilter/firewalld/75.0 p1:security:netfilter/firewalld/74.0
|
||||
- factory c:openSUSE:Factory/firewalld/33.0 p1:openSUSE:Factory/firewalld/32.0
|
||||
- factory c:openSUSE:Factory/firewalld/32.0 p1:openSUSE:Factory/firewalld/31.0 p2:security:netfilter/firewalld/74.0
|
||||
- devel c:security:netfilter/firewalld/74.0 p1:security:netfilter/firewalld/71.0
|
||||
- factory c:openSUSE:Factory/firewalld/31.0 p1:openSUSE:Factory/firewalld/30.0
|
||||
- factory c:openSUSE:Factory/firewalld/30.0 p1:openSUSE:Factory/firewalld/29.0 p2:security:netfilter/firewalld/71.0
|
||||
- devel c:security:netfilter/firewalld/71.0 p1:security:netfilter/firewalld/69.0
|
||||
- factory c:openSUSE:Factory/firewalld/29.0 p1:openSUSE:Factory/firewalld/28.0 p2:security:netfilter/firewalld/69.0
|
||||
- devel c:security:netfilter/firewalld/69.0 p1:security:netfilter/firewalld/68.0
|
||||
- factory c:openSUSE:Factory/firewalld/28.0 p1:openSUSE:Factory/firewalld/27.0 p2:security:netfilter/firewalld/68.0
|
||||
- devel c:security:netfilter/firewalld/68.0 p1:security:netfilter/firewalld/67.0
|
||||
- devel c:security:netfilter/firewalld/67.0 p1:security:netfilter/firewalld/65.0
|
||||
- factory c:openSUSE:Factory/firewalld/27.0 p1:openSUSE:Factory/firewalld/26.0 p2:security:netfilter/firewalld/65.0
|
||||
- devel c:security:netfilter/firewalld/65.0 p1:security:netfilter/firewalld/63.0
|
||||
- factory c:openSUSE:Factory/firewalld/26.0 p1:openSUSE:Factory/firewalld/25.0 p2:security:netfilter/firewalld/63.0
|
||||
- devel c:security:netfilter/firewalld/63.0 p1:security:netfilter/firewalld/61.0
|
||||
- factory c:openSUSE:Factory/firewalld/25.0 p1:openSUSE:Factory/firewalld/24.0 p2:security:netfilter/firewalld/61.0
|
||||
- devel c:security:netfilter/firewalld/61.0 p1:security:netfilter/firewalld/60.0
|
||||
- devel c:security:netfilter/firewalld/60.0 p1:security:netfilter/firewalld/59.0
|
||||
- devel c:security:netfilter/firewalld/59.0 p1:security:netfilter/firewalld/57.0
|
||||
- factory c:openSUSE:Factory/firewalld/24.0 p1:openSUSE:Factory/firewalld/23.0 p2:security:netfilter/firewalld/57.0
|
||||
- devel c:security:netfilter/firewalld/57.0 p1:security:netfilter/firewalld/55.0
|
||||
- factory c:openSUSE:Factory/firewalld/23.0 p1:openSUSE:Factory/firewalld/22.0 p2:security:netfilter/firewalld/55.0
|
||||
- devel c:security:netfilter/firewalld/55.0 p1:security:netfilter/firewalld/54.0
|
||||
- devel c:security:netfilter/firewalld/54.0 p1:security:netfilter/firewalld/53.0
|
||||
- devel c:security:netfilter/firewalld/53.0 p1:security:netfilter/firewalld/51.0
|
||||
- factory c:openSUSE:Factory/firewalld/22.0 p1:openSUSE:Factory/firewalld/21.0 p2:security:netfilter/firewalld/51.0
|
||||
- devel c:security:netfilter/firewalld/51.0 p1:security:netfilter/firewalld/50.0
|
||||
- devel c:security:netfilter/firewalld/50.0 p1:security:netfilter/firewalld/48.0
|
||||
- factory c:openSUSE:Factory/firewalld/21.0 p1:openSUSE:Factory/firewalld/20.0 p2:security:netfilter/firewalld/48.0
|
||||
- devel c:security:netfilter/firewalld/48.0 p1:security:netfilter/firewalld/47.0
|
||||
- devel c:security:netfilter/firewalld/47.0 p1:security:netfilter/firewalld/45.0
|
||||
- factory c:openSUSE:Factory/firewalld/20.0 p1:openSUSE:Factory/firewalld/19.0 p2:security:netfilter/firewalld/45.0
|
||||
- devel c:security:netfilter/firewalld/45.0 p1:security:netfilter/firewalld/43.0
|
||||
- factory c:openSUSE:Factory/firewalld/19.0 p1:openSUSE:Factory/firewalld/18.0 p2:security:netfilter/firewalld/43.0
|
||||
- devel c:security:netfilter/firewalld/43.0 p1:security:netfilter/firewalld/41.0
|
||||
- factory c:openSUSE:Factory/firewalld/18.0 p1:openSUSE:Factory/firewalld/17.0 p2:security:netfilter/firewalld/41.0
|
||||
- devel c:security:netfilter/firewalld/41.0 p1:security:netfilter/firewalld/39.0
|
||||
- factory c:openSUSE:Factory/firewalld/17.0 p1:openSUSE:Factory/firewalld/16.0 p2:security:netfilter/firewalld/39.0
|
||||
- devel c:security:netfilter/firewalld/39.0 p1:security:netfilter/firewalld/38.0
|
||||
- devel c:security:netfilter/firewalld/38.0 p1:security:netfilter/firewalld/36.0
|
||||
- factory c:openSUSE:Factory/firewalld/16.0 p1:openSUSE:Factory/firewalld/15.0 p2:security:netfilter/firewalld/36.0
|
||||
- devel c:security:netfilter/firewalld/36.0 p1:security:netfilter/firewalld/34.0
|
||||
- factory c:openSUSE:Factory/firewalld/15.0 p1:openSUSE:Factory/firewalld/14.0 p2:security:netfilter/firewalld/34.0
|
||||
- devel c:security:netfilter/firewalld/34.0 p1:security:netfilter/firewalld/32.0
|
||||
- factory c:openSUSE:Factory/firewalld/14.0 p1:openSUSE:Factory/firewalld/13.0 p2:security:netfilter/firewalld/32.0
|
||||
- devel c:security:netfilter/firewalld/32.0 p1:security:netfilter/firewalld/30.0
|
||||
- factory c:openSUSE:Factory/firewalld/13.0 p1:openSUSE:Factory/firewalld/12.0 p2:security:netfilter/firewalld/30.0
|
||||
- devel c:security:netfilter/firewalld/30.0 p1:security:netfilter/firewalld/28.0
|
||||
- factory c:openSUSE:Factory/firewalld/12.0 p1:openSUSE:Factory/firewalld/11.0 p2:security:netfilter/firewalld/28.0
|
||||
- devel c:security:netfilter/firewalld/28.0 p1:security:netfilter/firewalld/26.0
|
||||
- factory c:openSUSE:Factory/firewalld/11.0 p1:openSUSE:Factory/firewalld/10.0 p2:security:netfilter/firewalld/26.0
|
||||
- devel c:security:netfilter/firewalld/26.0 p1:security:netfilter/firewalld/24.0
|
||||
- factory c:openSUSE:Factory/firewalld/10.0 p1:openSUSE:Factory/firewalld/9.0 p2:security:netfilter/firewalld/24.0
|
||||
- devel c:security:netfilter/firewalld/24.0 p1:security:netfilter/firewalld/22.0
|
||||
- factory c:openSUSE:Factory/firewalld/9.0 p1:openSUSE:Factory/firewalld/8.0 p2:security:netfilter/firewalld/22.0
|
||||
- devel c:security:netfilter/firewalld/22.0 p1:security:netfilter/firewalld/21.0
|
||||
- devel c:security:netfilter/firewalld/21.0 p1:security:netfilter/firewalld/19.0
|
||||
- factory c:openSUSE:Factory/firewalld/8.0 p1:openSUSE:Factory/firewalld/7.0 p2:security:netfilter/firewalld/19.0
|
||||
- devel c:security:netfilter/firewalld/19.0 p1:security:netfilter/firewalld/17.0
|
||||
- factory c:openSUSE:Factory/firewalld/7.0 p1:openSUSE:Factory/firewalld/6.0 p2:security:netfilter/firewalld/17.0
|
||||
- devel c:security:netfilter/firewalld/17.0 p1:security:netfilter/firewalld/15.0
|
||||
- factory c:openSUSE:Factory/firewalld/6.0 p1:openSUSE:Factory/firewalld/5.0 p2:security:netfilter/firewalld/15.0
|
||||
- devel c:security:netfilter/firewalld/15.0 p1:security:netfilter/firewalld/13.0
|
||||
- factory c:openSUSE:Factory/firewalld/5.0 p1:openSUSE:Factory/firewalld/4.0 p2:security:netfilter/firewalld/13.0
|
||||
- devel c:security:netfilter/firewalld/13.0 p1:security:netfilter/firewalld/11.0
|
||||
- factory c:openSUSE:Factory/firewalld/4.0 p1:openSUSE:Factory/firewalld/3.0 p2:security:netfilter/firewalld/11.0
|
||||
- devel c:security:netfilter/firewalld/11.0 p1:security:netfilter/firewalld/9.0
|
||||
- factory c:openSUSE:Factory/firewalld/3.0 p1:openSUSE:Factory/firewalld/2.0 p2:security:netfilter/firewalld/9.0
|
||||
- devel c:security:netfilter/firewalld/9.0 p1:security:netfilter/firewalld/8.0
|
||||
- devel c:security:netfilter/firewalld/8.0 p1:security:netfilter/firewalld/6.0
|
||||
- factory c:openSUSE:Factory/firewalld/2.0 p1:openSUSE:Factory/firewalld/1.0 p2:security:netfilter/firewalld/6.0
|
||||
- devel c:security:netfilter/firewalld/6.0 p1:security:netfilter/firewalld/5.0
|
||||
- devel c:security:netfilter/firewalld/5.0 p1:security:netfilter/firewalld/4.0
|
||||
- devel c:security:netfilter/firewalld/4.0 p1:openSUSE:Factory/firewalld/1.0
|
||||
- factory c:openSUSE:Factory/firewalld/1.0 p1:security:netfilter/firewalld/2.0
|
||||
- factory c:security:netfilter/firewalld/2.0 p1:security:netfilter/firewalld/1.0
|
||||
- factory c:security:netfilter/firewalld/1.0
|
||||
240
tests/fixtures/firewalld-expected-tree.yaml
vendored
Normal file
240
tests/fixtures/firewalld-expected-tree.yaml
vendored
Normal file
@ -0,0 +1,240 @@
|
||||
- commit: openSUSE:Factory/firewalld/73.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/131.0
|
||||
- commit: openSUSE:Factory/firewalld/72.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/129.0
|
||||
- security:netfilter/firewalld/128.0
|
||||
- commit: openSUSE:Factory/firewalld/71.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/127.0
|
||||
- commit: openSUSE:Factory/firewalld/70.0
|
||||
- commit: openSUSE:Factory/firewalld/69.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/126.0
|
||||
- commit: openSUSE:Factory/firewalld/68.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/125.0
|
||||
- commit: openSUSE:Factory/firewalld/67.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/124.0
|
||||
- commit: openSUSE:Factory/firewalld/66.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/123.0
|
||||
- commit: openSUSE:Factory/firewalld/65.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/122.0
|
||||
- commit: openSUSE:Factory/firewalld/64.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/121.0
|
||||
- commit: openSUSE:Factory/firewalld/63.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/120.0
|
||||
- commit: openSUSE:Factory/firewalld/62.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/119.0
|
||||
- commit: openSUSE:Factory/firewalld/61.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/118.0
|
||||
- commit: openSUSE:Factory/firewalld/60.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/117.0
|
||||
- commit: openSUSE:Factory/firewalld/59.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/116.0
|
||||
- commit: openSUSE:Factory/firewalld/58.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/115.0
|
||||
- commit: openSUSE:Factory/firewalld/57.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/114.0
|
||||
- commit: openSUSE:Factory/firewalld/56.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/113.0
|
||||
- commit: openSUSE:Factory/firewalld/55.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/112.0
|
||||
- security:netfilter/firewalld/111.0
|
||||
- security:netfilter/firewalld/110.0
|
||||
- security:netfilter/firewalld/109.0
|
||||
- commit: openSUSE:Factory/firewalld/54.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/108.0
|
||||
- commit: openSUSE:Factory/firewalld/53.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/107.0
|
||||
- commit: openSUSE:Factory/firewalld/52.0
|
||||
- commit: openSUSE:Factory/firewalld/51.0
|
||||
- commit: openSUSE:Factory/firewalld/50.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/106.0
|
||||
- commit: openSUSE:Factory/firewalld/49.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/105.0
|
||||
- security:netfilter/firewalld/104.0
|
||||
- security:netfilter/firewalld/103.0
|
||||
- commit: openSUSE:Factory/firewalld/48.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/102.0
|
||||
- commit: openSUSE:Factory/firewalld/47.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/101.0
|
||||
- commit: openSUSE:Factory/firewalld/46.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/100.0
|
||||
- commit: openSUSE:Factory/firewalld/45.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/99.0
|
||||
- commit: openSUSE:Factory/firewalld/44.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/98.0
|
||||
- commit: openSUSE:Factory/firewalld/43.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/97.0
|
||||
- security:netfilter/firewalld/96.0
|
||||
- security:netfilter/firewalld/95.0
|
||||
- security:netfilter/firewalld/94.0
|
||||
- commit: openSUSE:Factory/firewalld/42.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/93.0
|
||||
- commit: openSUSE:Factory/firewalld/41.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/92.0
|
||||
- commit: openSUSE:Factory/firewalld/40.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/91.0
|
||||
- commit: openSUSE:Factory/firewalld/39.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/90.0
|
||||
- commit: openSUSE:Factory/firewalld/38.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/89.0
|
||||
- commit: openSUSE:Factory/firewalld/37.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/88.0
|
||||
- security:netfilter/firewalld/87.0
|
||||
- security:netfilter/firewalld/86.0
|
||||
- security:netfilter/firewalld/85.0
|
||||
- commit: openSUSE:Factory/firewalld/36.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/84.0
|
||||
- security:netfilter/firewalld/83.0
|
||||
- commit: openSUSE:Factory/firewalld/35.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/82.0
|
||||
- security:netfilter/firewalld/81.0
|
||||
- security:netfilter/firewalld/80.0
|
||||
- security:netfilter/firewalld/79.0
|
||||
- security:netfilter/firewalld/78.0
|
||||
- commit: openSUSE:Factory/firewalld/34.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/77.0
|
||||
- security:netfilter/firewalld/76.0
|
||||
- security:netfilter/firewalld/75.0
|
||||
- commit: openSUSE:Factory/firewalld/33.0
|
||||
- commit: openSUSE:Factory/firewalld/32.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/74.0
|
||||
- commit: openSUSE:Factory/firewalld/31.0
|
||||
- commit: openSUSE:Factory/firewalld/30.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/71.0
|
||||
- commit: openSUSE:Factory/firewalld/29.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/69.0
|
||||
- commit: openSUSE:Factory/firewalld/28.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/68.0
|
||||
- security:netfilter/firewalld/67.0
|
||||
- commit: openSUSE:Factory/firewalld/27.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/65.0
|
||||
- commit: openSUSE:Factory/firewalld/26.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/63.0
|
||||
- commit: openSUSE:Factory/firewalld/25.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/61.0
|
||||
- security:netfilter/firewalld/60.0
|
||||
- security:netfilter/firewalld/59.0
|
||||
- commit: openSUSE:Factory/firewalld/24.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/57.0
|
||||
- commit: openSUSE:Factory/firewalld/23.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/55.0
|
||||
- security:netfilter/firewalld/54.0
|
||||
- security:netfilter/firewalld/53.0
|
||||
- commit: openSUSE:Factory/firewalld/22.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/51.0
|
||||
- security:netfilter/firewalld/50.0
|
||||
- commit: openSUSE:Factory/firewalld/21.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/48.0
|
||||
- security:netfilter/firewalld/47.0
|
||||
- commit: openSUSE:Factory/firewalld/20.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/45.0
|
||||
- commit: openSUSE:Factory/firewalld/19.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/43.0
|
||||
- commit: openSUSE:Factory/firewalld/18.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/41.0
|
||||
- commit: openSUSE:Factory/firewalld/17.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/39.0
|
||||
- security:netfilter/firewalld/38.0
|
||||
- commit: openSUSE:Factory/firewalld/16.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/36.0
|
||||
- commit: openSUSE:Factory/firewalld/15.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/34.0
|
||||
- commit: openSUSE:Factory/firewalld/14.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/32.0
|
||||
- commit: openSUSE:Factory/firewalld/13.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/30.0
|
||||
- commit: openSUSE:Factory/firewalld/12.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/28.0
|
||||
- commit: openSUSE:Factory/firewalld/11.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/26.0
|
||||
- commit: openSUSE:Factory/firewalld/10.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/24.0
|
||||
- commit: openSUSE:Factory/firewalld/9.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/22.0
|
||||
- security:netfilter/firewalld/21.0
|
||||
- commit: openSUSE:Factory/firewalld/8.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/19.0
|
||||
- commit: openSUSE:Factory/firewalld/7.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/17.0
|
||||
- commit: openSUSE:Factory/firewalld/6.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/15.0
|
||||
- commit: openSUSE:Factory/firewalld/5.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/13.0
|
||||
- commit: openSUSE:Factory/firewalld/4.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/11.0
|
||||
- commit: openSUSE:Factory/firewalld/3.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/9.0
|
||||
- security:netfilter/firewalld/8.0
|
||||
- commit: openSUSE:Factory/firewalld/2.0
|
||||
merged:
|
||||
- security:netfilter/firewalld/6.0
|
||||
- security:netfilter/firewalld/5.0
|
||||
- security:netfilter/firewalld/4.0
|
||||
- commit: openSUSE:Factory/firewalld/1.0
|
||||
- commit: security:netfilter/firewalld/2.0
|
||||
- commit: security:netfilter/firewalld/1.0
|
||||
@ -68,6 +68,12 @@ class TestTreeMethods(unittest.TestCase):
|
||||
def test_breeze_tree(self):
|
||||
self.verify_package("breeze")
|
||||
|
||||
def test_firewalld_tree(self):
|
||||
self.verify_package("firewalld")
|
||||
|
||||
def test_FastCGI_tree(self):
|
||||
self.verify_package("FastCGI")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user