File tree 10 files changed +26
-12
lines changed
10 files changed +26
-12
lines changed Original file line number Diff line number Diff line change @@ -73,13 +73,11 @@ jobs:
73
73
python src/manage.py collectstatic --noinput --link
74
74
coverage run \
75
75
--concurrency=multiprocessing \
76
- --parallel-mode \
77
76
src/manage.py test src \
78
77
--parallel \
79
- --exclude-tag no-parallel
78
+ --exclude-tag=elastic
80
79
coverage run src/manage.py test src --tag no-parallel
81
80
coverage combine
82
- coverage report
83
81
84
82
env :
85
83
DJANGO_SETTINGS_MODULE : open_inwoner.conf.ci
Original file line number Diff line number Diff line change 3
3
4
4
from django .contrib .messages import get_messages
5
5
from django .core .files .uploadedfile import SimpleUploadedFile
6
- from django .test import override_settings , tag
6
+ from django .test import override_settings
7
7
from django .urls import reverse
8
8
from django .utils .translation import gettext as _
9
9
@@ -314,7 +314,10 @@ def test_action_status_not_your_action(self):
314
314
self .assertEqual (response .status_code , 404 )
315
315
316
316
317
+ < << << << HEAD
317
318
@tag ("e2e" )
319
+ == == == =
320
+ >> >> >> > 3 cf095c4 ([#1570] remove multi-browser support for playwright tests)
318
321
@override_settings (ROOT_URLCONF = "open_inwoner.cms.tests.urls" )
319
322
@patch ("open_inwoner.configurations.models.SiteConfiguration.get_solo" )
320
323
class ActionsPlaywrightTests (PlaywrightSyncLiveServerTestCase ):
Original file line number Diff line number Diff line change 1
1
from unittest import skip
2
2
3
- from django .test import override_settings , tag
3
+ from django .test import override_settings
4
4
from django .urls import reverse
5
5
from django .utils .translation import ugettext_lazy as _
6
6
@@ -230,7 +230,10 @@ def test_file_cannot_be_uploaded_when_sharing_disabled(self):
230
230
)
231
231
232
232
233
+ < << << << HEAD
233
234
@tag ("e2e" )
235
+ == == == =
236
+ >> >> >> > 3 cf095c4 ([#1570] remove multi-browser support for playwright tests)
234
237
@override_settings (ROOT_URLCONF = "open_inwoner.cms.tests.urls" )
235
238
class InboxPagePlaywrightTests (PlaywrightSyncLiveServerTestCase ):
236
239
@classmethod
Original file line number Diff line number Diff line change 32
32
DOCUMENTEN_ROOT ,
33
33
ZAKEN_ROOT ,
34
34
)
35
+ < << << << HEAD
35
36
from open_inwoner .utils .test import (
36
37
ClearCachesMixin ,
37
38
DisableRequestLogMixin ,
42
43
43
44
44
45
@tag ("e2e" )
46
+ == == == =
47
+ from open_inwoner .utils .test import ClearCachesMixin , paginated_response
48
+ from open_inwoner .utils .tests .playwright import PlaywrightSyncLiveServerTestCase
49
+
50
+
51
+ > >> >> >> 3 cf095c4 ([#1570] remove multi-browser support for playwright tests)
45
52
@requests_mock .Mocker ()
46
53
@override_settings (ROOT_URLCONF = "open_inwoner.cms.tests.urls" )
47
54
class CasesPlaywrightTests (
Original file line number Diff line number Diff line change 2
2
3
3
from django .contrib .messages import get_messages
4
4
from django .core import mail
5
- from django .test import override_settings , tag
5
+ from django .test import override_settings
6
6
from django .urls import reverse
7
7
from django .utils .translation import ugettext as _
8
8
@@ -1136,7 +1136,10 @@ def test_plan_contact_new_count(self):
1136
1136
self .assertEqual (len (links ), 1 )
1137
1137
1138
1138
1139
+ < << << << HEAD
1139
1140
@tag ("e2e" )
1141
+ == == == =
1142
+ >> >> >> > 3 cf095c4 ([#1570] remove multi-browser support for playwright tests)
1140
1143
@override_settings (ROOT_URLCONF = "open_inwoner.cms.tests.urls" )
1141
1144
class PlanActionStatusPlaywrightTests (ActionsPlaywrightTests ):
1142
1145
def setUp (self ) -> None :
Original file line number Diff line number Diff line change 16
16
from .utils import ESMixin
17
17
18
18
19
- @tag ("no-parallel " )
19
+ @tag ("elastic " )
20
20
class TestFeedbackFunctionality (ESMixin , WebTest ):
21
21
def setUp (self ):
22
22
self .user = UserFactory ()
Original file line number Diff line number Diff line change 12
12
from .utils import ESMixin
13
13
14
14
15
- @tag ("no-parallel " )
15
+ @tag ("elastic " )
16
16
@freeze_time ("2021-10-18 13:00:00" )
17
17
class TestLogging (ESMixin , WebTest ):
18
18
def test_search_query_of_logged_in_user_is_logged (self ):
Original file line number Diff line number Diff line change 14
14
from .utils import ESMixin
15
15
16
16
17
- @tag ("no-parallel " )
17
+ @tag ("elastic " )
18
18
@override_settings (ROOT_URLCONF = "open_inwoner.cms.tests.urls" )
19
19
class SearchPageTests (ESMixin , WebTest ):
20
20
url = reverse_lazy ("search:search" )
Original file line number Diff line number Diff line change 6
6
from .utils import ESMixin
7
7
8
8
9
- @tag ("no-parallel " )
9
+ @tag ("elastic " )
10
10
class AutocompleteTests (ESMixin , TestCase ):
11
11
def test_autocomplete_on_name (self ):
12
12
ProductFactory .create (name = "Name" , keywords = ["Keyword" ])
Original file line number Diff line number Diff line change 13
13
from .utils import ESMixin
14
14
15
15
16
- @tag ("no-parallel " )
16
+ @tag ("elastic " )
17
17
class SearchQueryTests (ESMixin , TestCase ):
18
18
def setUp (self ):
19
19
super ().setUp ()
@@ -84,7 +84,7 @@ def test_search_product_with_typo(self):
84
84
self .assertEqual (int (results [0 ].meta .id ), self .product1 .id )
85
85
86
86
87
- @tag ("no-parallel " )
87
+ @tag ("elastic " )
88
88
class SearchFacetTests (ESMixin , TestCase ):
89
89
def setUp (self ):
90
90
super ().setUp ()
You can’t perform that action at this time.
0 commit comments