Skip to content

Commit

Permalink
order by popcon as classmethod, and tests
Browse files Browse the repository at this point in the history
Signed-off-by: Lucas Severo <[email protected]>
Signed-off-by: Lucas Mattioli <[email protected]>
  • Loading branch information
knelasevero committed Jul 8, 2016
1 parent d408024 commit ecd33b4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
5 changes: 3 additions & 2 deletions pet/classifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ def __init__(self, session, named_trees,
nt, bugs.get(nt.source, []), suite_packages.get(nt.source, []),
tags.get(nt.package_id, [])))

def order_packages_by_popcon(self, packages):
@classmethod
def order_packages_by_popcon(cls, packages):
has_no_popcon = []
packages_queue = PriorityQueue()
for package in packages:
Expand All @@ -198,7 +199,7 @@ def order_packages_by_popcon(self, packages):
return ordered_packages

def classify(self):
self.packages = self.order_packages_by_popcon(self.packages)
self.packages = Classifier.order_packages_by_popcon(self.packages)
classified = dict()
for package in self.packages:
if package.ready_for_upload:
Expand Down
26 changes: 24 additions & 2 deletions test/test_classifier.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
import unittest
import pet.classifier
from pet.classifier import Classifier
import random
import popcon


class FakePackage():
def __init__(self):
self.name = ''


class TestPetClassifier(unittest.TestCase):

def setUp(self):
pass

def test_something(self):
pass
def test_classify_popcon(self):

package_libdigest_md4_perl = FakePackage()
package_libdigest_md4_perl.name = 'libdigest-md4-perl'
package_libsharyanto_utils_perl = FakePackage()
package_libsharyanto_utils_perl.name = 'libsharyanto-utils-perl'

packages = [package_libdigest_md4_perl, package_libsharyanto_utils_perl]
random.shuffle(packages)
ordered_packages = Classifier.order_packages_by_popcon(packages)

for i in range(0, len(packages) - 1):
package1 = popcon.package(ordered_packages[i].name)
package2 = popcon.package(ordered_packages[i + 1].name)
self.assertGreaterEqual(package1[ordered_packages[i].name],
package2[ordered_packages[i + 1].name])

0 comments on commit ecd33b4

Please sign in to comment.