Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make region required in Part 3 docs #525

Open
wants to merge 7 commits into
base: release/3.0
Choose a base branch
from
Open

Make region required in Part 3 docs #525

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1e5b63
Make region required in Part 3 docs
nigelmegitt Nov 15, 2019
01ba6d8
Remove patch file committed in error
nigelmegitt Nov 15, 2019
f6fcbb4
Somehow we missed an invalid test template xml file, fix that.
nigelmegitt Nov 15, 2019
afe3786
Update requirements and package lock to recent versions
nigelmegitt Dec 3, 2021
3cd50be
Make tests compatible with latest pytest and pytest-bdd
nigelmegitt Dec 3, 2021
51bc3df
Fix up the remaining BDD tests
nigelmegitt Dec 6, 2021
5011a16
Delete commented line
nigelmegitt Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ebu_tt_live/documents/ebutt3_segmentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def _prune_orphan_elements(self):
self._segment.head.styling = None
if len(self._segment.head.layout.region) == 0:
self._segment.head.layout.region = None
nigelmegitt marked this conversation as resolved.
Show resolved Hide resolved
self._segment.head.layout = None

def compute_document_segment(self):
# Init
Expand Down
5 changes: 4 additions & 1 deletion ebu_tt_live/documents/test/data/document.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
xmlns:ebuttp="urn:ebu:tt:parameters"
xmlns:tt="http://www.w3.org/ns/ttml"
xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
xmlns:tts="http://www.w3.org/ns/ttml#styling"
xmlns:xml="http://www.w3.org/XML/1998/namespace">
<tt:head>
<tt:metadata>
Expand All @@ -17,7 +18,9 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
<tt:layout>
<tt:region xml:id="r1" tts:origin="0% 0%" tts:extent="100% 100%"/>
</tt:layout>
</tt:head>
<tt:body begin="500ms" dur="00:00:05">
<tt:div>
Expand Down
1 change: 1 addition & 0 deletions ebu_tt_live/twisted/test/test_twisted_websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ def test_producer_to_producer_error(self):
# This is meant to fail handshake so wait for AssertionError here
self.assertRaises(AssertionError, self._connect)

@pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
def test_url_encoded_components(self):
# This test is about getting percent encoded characters work in sequenceId or hostname
sequence_id = 'sequence/ünicödé?/Name'
Expand Down
2 changes: 1 addition & 1 deletion ebu_tt_live/xsd/ebutt_live.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Please note that the EBU-TT XML Schema is a helping document and NOT normative b
</xs:annotation>
<xs:sequence>
<xs:element name="metadata" type="ebuttm:anyMetadata_type" minOccurs="0"/>
<xs:element name="region" type="tt:region" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="region" type="tt:region" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>

</xs:complexType>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/complete_document.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body begin="500ms" dur="00:00:05">
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/computed_resolved_time_semantics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
{% if not body %}
<tt:body
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/computed_resolved_time_semantics_empty_doc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
</tt:tt>
1 change: 0 additions & 1 deletion testing/bdd/templates/delayNode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body
{% if body_begin %}
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/delayTimingType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body>
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/elements_active_time_semantics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body
{% if body_begin %}
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/elements_active_time_semantics_empty_body.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body
{% if body_begin %}
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/handover.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body begin="500ms" dur="00:00:05">
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/referenceClockIdentifier.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body>
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/sequence_id_num.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body begin="500ms" dur="00:00:05">
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/sequence_identical_timing_model.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body>
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/smpte.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
{% if time_base == 'smpte' %}
<tt:body begin="00:00:05:01" end="00:00:12:12">
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/timeBase_attribute_mandatory.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
{% if time_base == "smpte" %}
<tt:body begin="00:00:00:13">
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/timeBase_clock_clockMode_mandatory.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body>
<tt:div>
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/timeBase_timeformat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body
{% if body_begin %}
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/time_regex_parsing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body
{% if body_begin %}
Expand Down
1 change: 0 additions & 1 deletion testing/bdd/templates/xml_lang_attribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<tt:styling>
<tt:style xml:id="ID001"/>
</tt:styling>
<tt:layout/>
</tt:head>
<tt:body>
<tt:div>
Expand Down