Skip to content

Commit

Permalink
no longer accept non-ring packages but show them in list
Browse files Browse the repository at this point in the history
  • Loading branch information
coolo committed Jul 16, 2015
1 parent 4456fb5 commit 77e9276
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
7 changes: 7 additions & 0 deletions osclib/list_command.py
Expand Up @@ -16,6 +16,8 @@ def perform(self):
# Print out the left overs
requests = self.api.get_open_requests()

non_ring_packages = []

for request in requests:
# Consolidate all data from request
request_id = int(request.get('id'))
Expand All @@ -40,3 +42,8 @@ def perform(self):
# above anyway
if ring:
print('Request({}): {} -> {}'.format(request_id, target_package, ring))
else:
non_ring_packages.append(target_package)

if len(non_ring_packages):
print "Not in a ring:", ' '.join(sorted(non_ring_packages))
4 changes: 2 additions & 2 deletions osclib/stagingapi.py
Expand Up @@ -398,8 +398,8 @@ def dispatch_open_requests(self):
requests = self.get_open_requests()
# check if we can reduce it down by accepting some
for rq in requests:
if self.crings:
self.accept_non_ring_request(rq)
#if self.crings:
# self.accept_non_ring_request(rq)
self.update_superseded_request(rq)

def get_prj_pseudometa(self, project):
Expand Down
1 change: 1 addition & 0 deletions tests/api_tests.py
Expand Up @@ -60,6 +60,7 @@ def test_ring_packages(self):
}
self.assertEqual(ring_packages, self.api.ring_packages)

@unittest.skip("no longer approving non-ring packages")
def test_dispatch_open_requests(self):
"""
Test dispatching and closure of non-ring packages
Expand Down

0 comments on commit 77e9276

Please sign in to comment.