Otro retoque a los tests

Metronus · Apr 24, 2017 · 1f78d9f · 1f78d9f
1 parent 118438f
commit 1f78d9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Metronus-Project/metronus_app/test/testDepartmentMetrics.py b/Metronus-Project/metronus_app/test/testDepartmentMetrics.py
@@ -37,7 +37,7 @@ def check_json_metrics_are_equal(self, response_string, data):
     self.assertEquals(len(response['names']), len(data['names']))
     self.assertEquals(len(response['values']), len(data['values']))
 
-    for (name, val) in zip(data['names'], data['values']):
+    for name, val in zip(data['names'], data['values']):
         self.assertTrue(name in response['names'])
         self.assertTrue(val in response['values'])
 

diff --git a/Metronus-Project/metronus_app/test/testProjectMetrics.py b/Metronus-Project/metronus_app/test/testProjectMetrics.py
@@ -30,7 +30,7 @@ def check_json_metrics_are_equal(self, response_string, data):
     self.assertEquals(len(response['names']), len(data['names']))
     self.assertEquals(len(response['values']), len(data['values']))
 
-    for (name, val) in zip(data['names'], data['values']):
+    for name, val in zip(data['names'], data['values']):
         self.assertTrue(name in response['names'])
         self.assertTrue(val in response['values'])
 

diff --git a/Metronus-Project/metronus_app/test/testTaskMetrics.py b/Metronus-Project/metronus_app/test/testTaskMetrics.py
@@ -37,7 +37,7 @@ def check_json_metrics_are_equal(self, response_string, data):
     self.assertEquals(len(response['names']), len(data['names']))
     self.assertEquals(len(response['values']), len(data['values']))
 
-    for (name, val) in zip(data['names'], data['values']):
+    for name, val in zip(data['names'], data['values']):
         self.assertTrue(name in response['names'])
         self.assertTrue(val in response['values'])
 

diff --git a/Metronus-Project/populate_database.py b/Metronus-Project/populate_database.py
@@ -12,7 +12,7 @@
 from metronus_app.model.projectDepartmentEmployeeRole import ProjectDepartmentEmployeeRole
 from django.db                                        import transaction
 @transaction.atomic
-def basicLoad():
+def basic_load():
     """
     Loads a lot of data from scratch
     """
@@ -304,9 +304,8 @@ def populate_roles():
 #############################################################################
 #############################################################################
 #############################################################################
-
 def populate_database():
     """
     This is called by python3 manage.py populate
     """
-    basicLoad()
+    basic_load()