[ARVADOS] updated: 1.1.3-256-ga02012d

Git user git at public.curoverse.com
Wed Mar 28 16:11:03 EDT 2018


Summary of changes:
 services/nodemanager/tests/test_status.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

       via  a02012dd96d06fe438bc198b104a65eef1d4915a (commit)
      from  d275d768486e8ad353aea08bd60c61f921d799c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a02012dd96d06fe438bc198b104a65eef1d4915a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Mar 28 17:10:43 2018 -0300

    12085: Test fixes.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/nodemanager/tests/test_status.py b/services/nodemanager/tests/test_status.py
index 910ad8a..2088a0d 100644
--- a/services/nodemanager/tests/test_status.py
+++ b/services/nodemanager/tests/test_status.py
@@ -8,6 +8,7 @@ from future import standard_library
 
 import json
 import mock
+import random
 import requests
 import unittest
 
@@ -63,10 +64,9 @@ class StatusServerUpdates(unittest.TestCase):
     def test_counters(self):
         with TestServer() as srv:
             resp = srv.get_status()
-            # Test initial values
+            # Test counters existance
             for counter in ['cloud_errors', 'boot_failures', 'actor_exceptions']:
                 self.assertIn(counter, resp)
-                self.assertEqual(0, resp[counter])
             # Test counter increment
             for count in range(1, 3):
                 status.tracker.counter_add('a_counter')
@@ -77,26 +77,25 @@ class StatusServerUpdates(unittest.TestCase):
     def test_idle_times(self, time_mock):
         with TestServer() as srv:
             resp = srv.get_status()
-            # Test idle_times initial value
+            node_name = 'idle_compute{}'.format(random.randint(1, 1024))
             self.assertIn('idle_times', resp)
-            self.assertEqual({}, resp['idle_times'])
             # Test add an idle node
             time_mock.return_value = 10
-            status.tracker.idle_in('compute42')
+            status.tracker.idle_in(node_name)
             time_mock.return_value += 10
             resp = srv.get_status()
-            self.assertEqual(10, resp['idle_times']['compute42'])
+            self.assertEqual(10, resp['idle_times'][node_name])
             # Test adding the same idle node a 2nd time
             time_mock.return_value += 10
-            status.tracker.idle_in('compute42')
+            status.tracker.idle_in(node_name)
             time_mock.return_value += 10
             resp = srv.get_status()
             # Idle timestamp doesn't get reset if already exists
-            self.assertEqual(30, resp['idle_times']['compute42'])
+            self.assertEqual(30, resp['idle_times'][node_name])
             # Test remove idle node
-            status.tracker.idle_out('compute42')
+            status.tracker.idle_out(node_name)
             resp = srv.get_status()
-            self.assertNotIn('compute42', resp['idle_times'])
+            self.assertNotIn(node_name, resp['idle_times'])
 
 
 class StatusServerDisabled(unittest.TestCase):

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list