Skip to content

Commit 0c0c0c9

Browse files
committed
Fix test fixture generation, it wasn't catching new name models not
ending in Name - Legacy-Id: 6303
1 parent 37825f2 commit 0c0c0c9

2 files changed

Lines changed: 126 additions & 4 deletions

File tree

ietf/name/fixtures/names.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"model": "name.constraintname",
8282
"fields": {
8383
"order": 0,
84+
"penalty": 0,
8485
"used": true,
8586
"name": "Conflicts with",
8687
"desc": ""
@@ -91,6 +92,7 @@
9192
"model": "name.constraintname",
9293
"fields": {
9394
"order": 0,
95+
"penalty": 0,
9496
"used": true,
9597
"name": "Conflicts with (secondary)",
9698
"desc": ""
@@ -101,6 +103,7 @@
101103
"model": "name.constraintname",
102104
"fields": {
103105
"order": 0,
106+
"penalty": 0,
104107
"used": true,
105108
"name": "Conflicts with (tertiary)",
106109
"desc": ""
@@ -700,6 +703,56 @@
700703
"desc": ""
701704
}
702705
},
706+
{
707+
"pk": "liaison",
708+
"model": "name.doctypename",
709+
"fields": {
710+
"order": 0,
711+
"used": false,
712+
"name": "Liaison",
713+
"desc": ""
714+
}
715+
},
716+
{
717+
"pk": "comment",
718+
"model": "name.feedbacktype",
719+
"fields": {
720+
"order": 0,
721+
"used": true,
722+
"name": "Comment",
723+
"desc": ""
724+
}
725+
},
726+
{
727+
"pk": "questio",
728+
"model": "name.feedbacktype",
729+
"fields": {
730+
"order": 0,
731+
"used": true,
732+
"name": "Questionnaire response",
733+
"desc": ""
734+
}
735+
},
736+
{
737+
"pk": "nomina",
738+
"model": "name.feedbacktype",
739+
"fields": {
740+
"order": 0,
741+
"used": true,
742+
"name": "Nomination",
743+
"desc": ""
744+
}
745+
},
746+
{
747+
"pk": "junk",
748+
"model": "name.feedbacktype",
749+
"fields": {
750+
"order": 0,
751+
"used": true,
752+
"name": "Junk",
753+
"desc": ""
754+
}
755+
},
703756
{
704757
"pk": "active",
705758
"model": "name.groupmilestonestatename",
@@ -920,6 +973,16 @@
920973
"desc": ""
921974
}
922975
},
976+
{
977+
"pk": "nomcom",
978+
"model": "name.grouptypename",
979+
"fields": {
980+
"order": 0,
981+
"used": true,
982+
"name": "Nomcom",
983+
"desc": "An IETF/IAB Nominating Committee. Use 'SDO' for external nominating committees."
984+
}
985+
},
923986
{
924987
"pk": "ps",
925988
"model": "name.intendedstdlevelname",
@@ -1050,6 +1113,36 @@
10501113
"desc": ""
10511114
}
10521115
},
1116+
{
1117+
"pk": "pending",
1118+
"model": "name.nomineepositionstate",
1119+
"fields": {
1120+
"order": 0,
1121+
"used": true,
1122+
"name": "Nominated, pending response",
1123+
"desc": ""
1124+
}
1125+
},
1126+
{
1127+
"pk": "accepted",
1128+
"model": "name.nomineepositionstate",
1129+
"fields": {
1130+
"order": 0,
1131+
"used": true,
1132+
"name": "Accepted",
1133+
"desc": ""
1134+
}
1135+
},
1136+
{
1137+
"pk": "declined",
1138+
"model": "name.nomineepositionstate",
1139+
"fields": {
1140+
"order": 0,
1141+
"used": true,
1142+
"name": "Declined",
1143+
"desc": ""
1144+
}
1145+
},
10531146
{
10541147
"pk": "ad",
10551148
"model": "name.rolename",
@@ -2623,6 +2716,19 @@
26232716
"desc": "Independent Submission awaiting author update, or in discussion between author and ISE"
26242717
}
26252718
},
2719+
{
2720+
"pk": 133,
2721+
"model": "doc.state",
2722+
"fields": {
2723+
"used": true,
2724+
"name": "Pending",
2725+
"next_states": [],
2726+
"slug": "pending",
2727+
"type": "draft-rfceditor",
2728+
"order": 0,
2729+
"desc": ""
2730+
}
2731+
},
26262732
{
26272733
"pk": 45,
26282734
"model": "doc.state",
@@ -2753,6 +2859,21 @@
27532859
"desc": "This document was an active IAB document, but for some reason it is no longer being pursued for the IAB stream. It is possible that the document might be revived later, possibly in another stream."
27542860
}
27552861
},
2862+
{
2863+
"pk": 134,
2864+
"model": "doc.state",
2865+
"fields": {
2866+
"used": true,
2867+
"name": "Candidate for WG Adoption",
2868+
"next_states": [
2869+
35
2870+
],
2871+
"slug": "wg-cand",
2872+
"type": "draft-stream-ietf",
2873+
"order": 0,
2874+
"desc": "The document has been marked as a candidate for WG adoption by the WG Chair. This state can be used before a call for adoption is issued (and the document is put in the \"Call For Adoption By WG Issued\" state), to indicate that the document is in the queue for a call for adoption, even if none has been issued yet."
2875+
}
2876+
},
27562877
{
27572878
"pk": 35,
27582879
"model": "doc.state",

ietf/name/generate_fixtures.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ def output(name, qs):
2929
# pick all name models directly out of the module
3030
objects = []
3131

32+
import inspect
3233
import ietf.name.models
3334
for n in dir(ietf.name.models):
34-
if n[:1].upper() == n[:1] and n.endswith("Name"):
35-
model = getattr(ietf.name.models, n)
36-
if not model._meta.abstract:
37-
objects.extend(model.objects.all())
35+
symbol = getattr(ietf.name.models, n)
36+
if inspect.isclass(symbol) and issubclass(symbol, ietf.name.models.NameModel):
37+
if not symbol._meta.abstract:
38+
objects.extend(symbol.objects.all())
3839

3940

4041
import ietf.doc.models # also pick some other name-like types while we're at it

0 commit comments

Comments
 (0)