From 9a86a39738cd4bc34f8bfa29ea4e6ccd11f13daa Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Tue, 23 Jul 2024 11:54:06 -0400
Subject: [PATCH] test: fix basic program tests
---
program/tests/test_basic_program.py | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/program/tests/test_basic_program.py b/program/tests/test_basic_program.py
index bfc08892..5e6df8c0 100644
--- a/program/tests/test_basic_program.py
+++ b/program/tests/test_basic_program.py
@@ -50,9 +50,10 @@ def test_basic(admin_api_client, api_client, daily_rrule, show):
response = api_client.get(url())
assert response.status_code == 200
- assert len(response.json()) == 1
+ assert len(response.json()) == 2
- assert_entry(response.json()[0], show)
+ for entry in response.json():
+ assert_entry(entry, show)
def test_basic_one_week(admin_api_client, api_client, daily_rrule, show):
@@ -86,14 +87,14 @@ def test_basic_include_virtual(
assert response.status_code == 200
assert len(response.json()) == 3
- virtual_entry1, entry, virtual_entry2 = response.json()
+ entry1, virtual_entry, entry2 = response.json()
- assert_virtual_entry(virtual_entry1, fallback_show)
- assert_entry(entry, show)
- assert_virtual_entry(virtual_entry2, fallback_show)
+ assert_entry(entry1, show)
+ assert_virtual_entry(virtual_entry, fallback_show)
+ assert_entry(entry2, show)
- assert virtual_entry1["end"] == entry["start"]
- assert entry["end"] == virtual_entry2["start"]
+ assert entry1["end"] == virtual_entry["start"]
+ assert virtual_entry["end"] == entry2["start"]
def test_basic_one_week_include_virtual(
@@ -118,11 +119,11 @@ def test_basic_one_week_include_virtual(
entries = response.json()
- for virtual_entry in entries[0::2]:
- assert_virtual_entry(virtual_entry, fallback_show)
-
- for entry in entries[1::2]:
+ for entry in entries[0::2]:
assert_entry(entry, show)
+ for virtual_entry in entries[1::2]:
+ assert_virtual_entry(virtual_entry, fallback_show)
+
for entry1, entry2 in pairwise(entries):
assert entry1["end"] == entry2["start"]
--
GitLab