fix test data index conflicts

petrjasek · petrjasek · commit 7cb15af72acc · 2025-08-29T17:52:52.000+02:00
diff --git a/server/analytics/chart_config/chart_config_test.py b/server/analytics/chart_config/chart_config_test.py
@@ -71,18 +71,21 @@ def setUp(self):
                 [
                     {
                         "_id": "user1",
+                        "username": "user1",
                         "display_name": "first user",
                         "is_active": True,
                         "is_enabled": True,
                     },
                     {
                         "_id": "user2",
+                        "username": "user2",
                         "display_name": "second user",
                         "is_active": True,
                         "is_enabled": True,
                     },
                     {
                         "_id": "user3",
+                        "username": "user3",
                         "display_name": "last user",
                         "is_active": True,
                         "is_enabled": True,
diff --git a/server/analytics/planning_usage_report/planning_usage_report_test.py b/server/analytics/planning_usage_report/planning_usage_report_test.py
@@ -36,8 +36,8 @@ def test_get_users_with_planning(self):
         self.app.data.insert(
             "roles",
             [
-                {"_id": "role1", "privileges": {"planning": 0}},
-                {"_id": "role2", "privileges": {"planning": 1}},
+                {"_id": "role1", "name": "role1", "privileges": {"planning": 0}},
+                {"_id": "role2", "name": "role2", "privileges": {"planning": 1}},
             ],
         )
 
@@ -46,25 +46,29 @@ def test_get_users_with_planning(self):
             [
                 {
                     "_id": "user1",
+                    "username": "user1",
                     "privileges": {"planning": 0},
                     "is_active": True,
                     "is_enabled": True,
                 },
                 {
                     "_id": "user2",
+                    "username": "user2",
                     "privileges": {"planning": 1},
                     "is_active": True,
                     "is_enabled": True,
                 },
                 {
                     "_id": "user3",
+                    "username": "user3",
                     "privileges": {},
                     "role": "role1",
                     "is_active": True,
                     "is_enabled": True,
                 },
                 {
                     "_id": "user4",
+                    "username": "user4",
                     "privileges": {},
                     "role": "role2",
                     "is_active": True,
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -1,5 +1,3 @@
-nose
-nose-timer
 pep8
 flake8
 flake8-docstrings
diff --git a/test-server/requirements.txt b/test-server/requirements.txt
@@ -1,4 +1,3 @@
 gunicorn==19.6.0
 honcho==0.6.6
-newrelic>=2.66,<2.67
 git://github.com/superdesk/superdesk-core.git@v2.10.0#egg=Superdesk_Core

Original file line number	Diff line number	Diff line change
`@@ -71,18 +71,21 @@ def setUp(self):`
`71`	`71`	`[`
`72`	`72`	`{`
`73`	`73`	`"_id": "user1",`
	`74`	`+ "username": "user1",`
`74`	`75`	`"display_name": "first user",`
`75`	`76`	`"is_active": True,`
`76`	`77`	`"is_enabled": True,`
`77`	`78`	`},`
`78`	`79`	`{`
`79`	`80`	`"_id": "user2",`
	`81`	`+ "username": "user2",`
`80`	`82`	`"display_name": "second user",`
`81`	`83`	`"is_active": True,`
`82`	`84`	`"is_enabled": True,`
`83`	`85`	`},`
`84`	`86`	`{`
`85`	`87`	`"_id": "user3",`
	`88`	`+ "username": "user3",`
`86`	`89`	`"display_name": "last user",`
`87`	`90`	`"is_active": True,`
`88`	`91`	`"is_enabled": True,`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ def test_get_users_with_planning(self):`
`36`	`36`	`self.app.data.insert(`
`37`	`37`	`"roles",`
`38`	`38`	`[`
`39`		`- {"_id": "role1", "privileges": {"planning": 0}},`
`40`		`- {"_id": "role2", "privileges": {"planning": 1}},`
	`39`	`+ {"_id": "role1", "name": "role1", "privileges": {"planning": 0}},`
	`40`	`+ {"_id": "role2", "name": "role2", "privileges": {"planning": 1}},`
`41`	`41`	`],`
`42`	`42`	`)`
`43`	`43`
`@@ -46,25 +46,29 @@ def test_get_users_with_planning(self):`
`46`	`46`	`[`
`47`	`47`	`{`
`48`	`48`	`"_id": "user1",`
	`49`	`+ "username": "user1",`
`49`	`50`	`"privileges": {"planning": 0},`
`50`	`51`	`"is_active": True,`
`51`	`52`	`"is_enabled": True,`
`52`	`53`	`},`
`53`	`54`	`{`
`54`	`55`	`"_id": "user2",`
	`56`	`+ "username": "user2",`
`55`	`57`	`"privileges": {"planning": 1},`
`56`	`58`	`"is_active": True,`
`57`	`59`	`"is_enabled": True,`
`58`	`60`	`},`
`59`	`61`	`{`
`60`	`62`	`"_id": "user3",`
	`63`	`+ "username": "user3",`
`61`	`64`	`"privileges": {},`
`62`	`65`	`"role": "role1",`
`63`	`66`	`"is_active": True,`
`64`	`67`	`"is_enabled": True,`
`65`	`68`	`},`
`66`	`69`	`{`
`67`	`70`	`"_id": "user4",`
	`71`	`+ "username": "user4",`
`68`	`72`	`"privileges": {},`
`69`	`73`	`"role": "role2",`
`70`	`74`	`"is_active": True,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-nose`
`2`		`-nose-timer`
`3`	`1`	`pep8`
`4`	`2`	`flake8`
`5`	`3`	`flake8-docstrings`