Merge branch 'master' into terjekv/phantom-SRV-records

terjekv · Jun 5, 2024 · c9a6d5e · c9a6d5e
2 parents 6d68ebe + bbfcf18
commit c9a6d5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mreg/api/v1/tests/tests.py b/mreg/api/v1/tests/tests.py
@@ -289,8 +289,8 @@ class APIMetaTestCase(MregAPITestCase):
     def test_meta_versions_admin_200_ok(self):
         response = self.assert_get_and_200("/api/meta/versions")
         for key in ('rest_framework_version', 'django_version', 'python_version'):
-            self.assertTrue(key in response.data)
-            print(key, response.data[key])
+            with self.subTest(key=key):
+                self.assertTrue(key in response.data)
 
     def test_meta_versions_user_403_forbidden(self):
         self.client = self.get_token_client(superuser=False)
@@ -300,8 +300,8 @@ def test_meta_heartbeat_user_200_ok(self):
         self.client = self.get_token_client(superuser=False)
         response = self.assert_get("/api/meta/heartbeat")
         for key in ('uptime', 'start_time'):
-            self.assertTrue(key in response.data)
-            print(key, response.data[key])
+            with self.subTest(key=key):
+                self.assertTrue(key in response.data)
 
 
 class APIAutoupdateZonesTestCase(MregAPITestCase):

diff --git a/mreg/api/views.py b/mreg/api/views.py
@@ -81,7 +81,7 @@ class MetaHeartbeat(APIView):
     permission_classes = (IsAuthenticated,)
 
     def get(self, request: Request):
-        uptime = int(start_time - time.time())
+        uptime = int(time.time() - start_time)
         data = {
             "start_time": start_time,
             "uptime": uptime,