Use f-strings instead of '…'.format() in tests

testfixtures/board.py

@@ -22,13 +22,13 @@ def create_category(
     board_id, *, number=1, slug=None, title=None, description=None
 ):
     if slug is None:
-        slug = 'category-{}'.format(number)
+        slug = f'category-{number}'
 
     if title is None:
-        title = 'Kategorie {}'.format(number)
+        title = f'Kategorie {number}'
 
     if description is None:
-        description = 'Hier geht es um Kategorie {}'.format(number)
+        description = f'Hier geht es um Kategorie {number}'
 
     return category_command_service.create_category(
         board_id, slug, title, description
@@ -37,10 +37,10 @@ def create_category(
 
 def create_topic(category_id, creator_id, *, number=1, title=None, body=None):
     if title is None:
-        title = 'Thema {}'.format(number)
+        title = f'Thema {number}'
 
     if body is None:
-        body = 'Inhalt von Thema {}'.format(number)
+        body = f'Inhalt von Thema {number}'
 
     return topic_command_service.create_topic(
         category_id, creator_id, title, body
@@ -49,6 +49,6 @@ def create_topic(category_id, creator_id, *, number=1, title=None, body=None):
 
 def create_posting(topic, creator_id, *, number=1, body=None):
     if body is None:
-        body = 'Inhalt von Beitrag {}.'.format(number)
+        body = f'Inhalt von Beitrag {number}.'
 
     return posting_command_service.create_posting(topic, creator_id, body)

testfixtures/user.py

@@ -28,7 +28,7 @@ def create_user(
         created_at = datetime.utcnow()
 
     if not email_address:
-        email_address = 'user{}@example.com'.format(user_id)
+        email_address = f'user{user_id}@example.com'
 
     user = user_creation_service.build_user(
         created_at, screen_name, email_address

tests/blueprints/admin/shop/order/test_order_export.py

@@ -49,7 +49,7 @@ def test_serialize_order(self):
         with codecs.open(filename, encoding='iso-8859-1') as f:
             expected = f.read().rstrip()
 
-        url = '/admin/shop/orders/{}/export'.format(self.order.id)
+        url = f'/admin/shop/orders/{self.order.id}/export'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.get(url)
 

tests/blueprints/admin/shop/order/test_views.py

@@ -76,7 +76,7 @@ def test_cancel_before_paid(
 
         assert_payment_is_open(order_before)
 
-        url = '/admin/shop/orders/{}/cancel'.format(order_before.id)
+        url = f'/admin/shop/orders/{order_before.id}/cancel'
         form_data = {
             'reason': 'Dein Vorname ist albern!',
             'send_email': 'y',
@@ -113,7 +113,7 @@ def test_cancel_before_paid_without_sending_email(
         quantified_articles_to_order = {(article_before, 3)}
         placed_order = self.place_order(quantified_articles_to_order)
 
-        url = '/admin/shop/orders/{}/cancel'.format(placed_order.id)
+        url = f'/admin/shop/orders/{placed_order.id}/cancel'
         form_data = {
             'reason': 'Dein Vorname ist albern!',
             # Sending e-mail is not requested.
@@ -140,7 +140,7 @@ def test_mark_order_as_paid(
 
         assert_payment_is_open(order_before)
 
-        url = '/admin/shop/orders/{}/mark_as_paid'.format(order_before.id)
+        url = f'/admin/shop/orders/{order_before.id}/mark_as_paid'
         form_data = {'payment_method': 'direct_debit'}
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url, data=form_data)
@@ -181,12 +181,12 @@ def test_cancel_after_paid(
 
         assert_payment_is_open(order_before)
 
-        url = '/admin/shop/orders/{}/mark_as_paid'.format(order_before.id)
+        url = f'/admin/shop/orders/{order_before.id}/mark_as_paid'
         form_data = {'payment_method': 'bank_transfer'}
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url, data=form_data)
 
-        url = '/admin/shop/orders/{}/cancel'.format(order_before.id)
+        url = f'/admin/shop/orders/{order_before.id}/cancel'
         form_data = {
             'reason': 'Dein Vorname ist albern!',
             'send_email': 'n',

tests/blueprints/api/tourney/match/test_comment_create.py

@@ -71,7 +71,7 @@ def create_match(self):
         return match_service.create_match()
 
     def request_comment_creation(self, match_id, *, user_id=None):
-        url = '/api/tourney/matches/{}/comments'.format(match_id)
+        url = f'/api/tourney/matches/{match_id}/comments'
 
         headers = [
             assemble_authorization_header('just-say-PLEASE'),

tests/blueprints/board/test_topic_hide_unhide.py

@@ -33,7 +33,7 @@ def test_hide_topic(self):
 
         assert_topic_is_not_hidden(topic_before)
 
-        url = '/board/topics/{}/flags/hidden'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/hidden'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url)
 
@@ -47,7 +47,7 @@ def test_unhide_topic(self):
 
         assert_topic_is_hidden(topic_before, self.admin.id)
 
-        url = '/board/topics/{}/flags/hidden'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/hidden'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.delete(url)
 

tests/blueprints/board/test_topic_lock_unlock.py

@@ -32,7 +32,7 @@ def test_lock_topic(self):
 
         assert_topic_is_not_locked(topic_before)
 
-        url = '/board/topics/{}/flags/locked'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/locked'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url)
 
@@ -46,7 +46,7 @@ def test_unlock_topic(self):
 
         assert_topic_is_locked(topic_before, self.admin.id)
 
-        url = '/board/topics/{}/flags/locked'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/locked'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.delete(url)
 

tests/blueprints/board/test_topic_move.py

@@ -29,7 +29,7 @@ def test_move_topic(self):
 
         assert topic_before.category.id == self.category_id_1
 
-        url = '/board/topics/{}/move'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/move'
         form_data = {'category_id': self.category_id_2}
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url, data=form_data)

tests/blueprints/board/test_topic_pin_unpin.py

@@ -32,7 +32,7 @@ def test_pin_topic(self):
 
         assert_topic_is_not_pinned(topic_before)
 
-        url = '/board/topics/{}/flags/pinned'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/pinned'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.post(url)
 
@@ -46,7 +46,7 @@ def test_unpin_topic(self):
 
         assert_topic_is_pinned(topic_before, self.admin.id)
 
-        url = '/board/topics/{}/flags/pinned'.format(topic_before.id)
+        url = f'/board/topics/{topic_before.id}/flags/pinned'
         with http_client(self.app, user_id=self.admin.id) as client:
             response = client.delete(url)
 

tests/blueprints/newsletter_admin/test_views.py

@@ -53,8 +53,8 @@ def setup_subscribers(self):
             (8, True,  False, True , [SubscriptionState.requested                             ]),
         ]:
             user = create_user(
-                screen_name='User-{:d}'.format(number),
-                email_address='user{:03d}@example.com'.format(number),
+                screen_name=f'User-{number:d}',
+                email_address=f'user{number:03d}@example.com',
                 initialized=initialized,
             )
 

tests/blueprints/shop/order/test_views.py

@@ -64,7 +64,7 @@ def test_order(self, order_email_service_mock, order_placed_mock):
         assert article_before.quantity == 5
 
         url = '/shop/order'
-        article_quantity_key = 'article_{}'.format(self.article_id)
+        article_quantity_key = f'article_{self.article_id}'
         form_data = {
             'first_names': 'Hiro',
             'last_name': 'Protagonist',
@@ -98,9 +98,7 @@ def test_order(self, order_email_service_mock, order_placed_mock):
 
         order_placed_mock.assert_called_once_with(None, order_id=order.id)
 
-        order_detail_page_url = 'http://example.com/shop/orders/{}'.format(
-            order.id
-        )
+        order_detail_page_url = f'http://example.com/shop/orders/{order.id}'
 
         assert_response_headers(response, order_detail_page_url)
 
@@ -115,7 +113,7 @@ def test_order_single(self, order_email_service_mock, order_placed_mock):
         article_before = self.get_article()
         assert article_before.quantity == 5
 
-        url = '/shop/order_single/{}'.format(str(self.article_id))
+        url = f'/shop/order_single/{self.article_id!s}'
         form_data = {
             'first_names': 'Hiro',
             'last_name': 'Protagonist',
@@ -149,9 +147,7 @@ def test_order_single(self, order_email_service_mock, order_placed_mock):
 
         order_placed_mock.assert_called_once_with(None, order_id=order.id)
 
-        order_detail_page_url = 'http://example.com/shop/orders/{}'.format(
-            order.id
-        )
+        order_detail_page_url = f'http://example.com/shop/orders/{order.id}'
 
         assert_response_headers(response, order_detail_page_url)
 

tests/blueprints/shop/orders/test_views.py

@@ -99,7 +99,7 @@ def place_order(self, shop_id, user):
     def request_view(self, current_user, order_id):
         login_user(current_user.id)
 
-        url = '/shop/orders/{}'.format(str(order_id))
+        url = f'/shop/orders/{order_id!s}'
 
         with http_client(self.app, user_id=current_user.id) as client:
             response = client.get(url)

tests/blueprints/user/test_views_create.py

@@ -71,8 +71,8 @@ def setup_terms(self):
         )
 
         consent_subject = consent_subject_service.create_subject(
-            '{}_terms-of-service_v1'.format(self.brand_id),
-            'Terms of service for {} / v1'.format(self.brand.title),
+            f'{self.brand_id}_terms-of-service_v1',
+            f'Terms of service for {self.brand.title} / v1',
             'terms_of_service',
         )
 
@@ -98,8 +98,8 @@ def setup_terms(self):
 
     def setup_privacy_policy(self):
         consent_subject = consent_subject_service.create_subject(
-            '{}_privacy_policy_v1'.format(self.brand_id),
-            'Privacy policy for {} / v1'.format(self.brand.title),
+            f'{self.brand_id}_privacy_policy_v1',
+            f'Privacy policy for {self.brand.title} / v1',
             'privacy_policy',
         )
 
@@ -196,13 +196,11 @@ def test_create(self, send_email_mock):
         expected_sender = 'noreply@example.com'
         expected_recipients = ['hiro@metaverse.org']
         expected_subject = 'Hiro, bitte bestätige deine E-Mail-Adresse'
-        expected_body = '''
+        expected_body = f'''
 Hallo Hiro,
 
-bitte bestätige deine E-Mail-Adresse, indem du diese URL abrufst: https://www.example.com/users/email_address/confirmation/{}
-        '''.strip().format(
-            verification_token.token
-        )
+bitte bestätige deine E-Mail-Adresse, indem du diese URL abrufst: https://www.example.com/users/email_address/confirmation/{verification_token.token}
+        '''.strip()
 
         send_email_mock.assert_called_once_with(
             expected_sender,

tests/blueprints/user/test_views_email_address_confirmation.py

@@ -47,8 +47,6 @@ def test_confirm_email_address_with_unknown_token(self):
         assert not self.user.initialized
 
     def _confirm(self, verification_token):
-        url = '/users/email_address/confirmation/{}'.format(
-            verification_token.token
-        )
+        url = f'/users/email_address/confirmation/{verification_token.token}'
         with http_client(self.app) as client:
             return client.get(url)

tests/blueprints/user/test_views_user_profile.py

@@ -23,7 +23,7 @@ def setUp(self):
         self.user = create_user()
 
     def test_view_profile(self):
-        url = '/users/{}'.format(self.user.id)
+        url = f'/users/{self.user.id}'
 
         with http_client(self.app) as client:
             response = client.get(url)

tests/blueprints/user_message/test_send.py

@@ -46,9 +46,7 @@ def test_send_when_logged_in_without_brand_contact_address(
 Alice
 '''
 
-        expected_response_location = 'http://example.com/users/{}'.format(
-            recipient.id
-        )
+        expected_response_location = f'http://example.com/users/{recipient.id}'
 
         expected_email_sender = 'ACME Entertainment Convention <noreply@example.com>'
         expected_email_recipients = ['Bob <bob@example.com>']
@@ -116,9 +114,7 @@ def test_send_when_logged_in_with_brand_contact_address(
 Bob
 '''
 
-        expected_response_location = 'http://example.com/users/{}'.format(
-            recipient.id
-        )
+        expected_response_location = f'http://example.com/users/{recipient.id}'
 
         expected_email_sender = 'ACME Entertainment Convention <noreply@example.com>'
         expected_email_recipients = ['Alice <alice@example.com>']
@@ -174,7 +170,7 @@ def test_send_when_not_logged_in(self):
     # helpers
 
     def send_request(self, recipient_id, text, *, current_user_id=None):
-        url = '/user_messages/to/{}/create'.format(recipient_id)
+        url = f'/user_messages/to/{recipient_id}/create'
 
         form_data = {
             'body': text,

tests/services/news/test_models.py

@@ -48,7 +48,7 @@ def app(party_app, db):
 
 
 def create_channel(brand_id):
-    channel_id = '{}-test'.format(brand_id)
+    channel_id = f'{brand_id}-test'
     url_prefix = 'https://example.com/news/'
     return news_channel_service.create_channel(brand_id, channel_id, url_prefix)
 

tests/services/shop/order/models/test_order_total_amount.py

@@ -56,8 +56,8 @@ def test_with_multiple_items(self):
     # helpers
 
     def create_article(self, number, price):
-        item_number = 'LF-01-A{:05d}'.format(number)
-        description = 'Artikel #{:d}'.format(number)
+        item_number = f'LF-01-A{number:05d}'
+        description = f'Artikel #{number:d}'
 
         return super().create_article(
             self.shop.id,