Update sort to include second field

diff --git a/cbdb.py b/cbdb.py
index 5eda3d5e1fe4a2d0f94516ddd893c06e17f90a64..3f7f0569fc47453613b41a13d0c20a0ab84475e1 100644 (file)
--- a/cbdb.py
+++ b/cbdb.py
@@ -50,5 +50,5 @@ class Db:
         top = []
         for (un, cnt) in users.items():
             top.append((un, cnt))
-        top.sort(key=lambda x: x[1], reverse=True)
+        top.sort(key=lambda x: (x[1], x[0]), reverse=True)
         return top

diff --git a/ut/test_db.py b/ut/test_db.py
index 0aae05deddc3f22e62919c61db332a3ab23999e8..32fd3f00213500a56acaf532afd4c16a650a12b0 100644 (file)
--- a/ut/test_db.py
+++ b/ut/test_db.py
@@ -142,7 +142,7 @@ class TopMateDrinkers(TestCase):
             db = Db(TESTDB_FILENAME)
             top = db.getTopMateDrinkers()
             topsorted = list(top)
-            topsorted.sort(key=lambda x: x[1], reverse=True)
+            topsorted.sort(key=lambda x: (x[1], x[0]), reverse=True)
             self.assertEqual(
                 top,
                 topsorted
@@ -155,7 +155,7 @@ class TopMateDrinkers(TestCase):
         db = Db(cfg.getCoffeeDbPath())
         top = db.getTopMateDrinkers()
         topsorted = list(top)
-        topsorted.sort(key=lambda x: x[1], reverse=True)
+        topsorted.sort(key=lambda x: (x[1], x[0]), reverse=True)
         self.assertEqual(
             top,
             topsorted