Skip to content

Commit f26c27b

Browse files
author
Kip Lehman
committed
S142094 minor mod changing ExternalId to ExternalID in PullRequest attributes
1 parent 6b8c006 commit f26c27b

File tree

2 files changed

+96
-24
lines changed

2 files changed

+96
-24
lines changed

‎pyral/entity.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class Connection(WorkspaceDomainObject):
486486
MINIMAL_WDO_ATTRIBUTES = ['_type',
487487
'oid', 'ref', 'ObjectID', 'ObjectUUID', '_ref',
488488
'_CreatedAt', '_hydrated', 'Subscription', 'Workspace']
489-
CONNECTION_INFO_ATTRS = ['ExternalId', 'ExternalFormattedId', 'Name', 'Description', 'Url', 'Artifact']
489+
CONNECTION_INFO_ATTRIBUTES = ['ExternalId', 'ExternalFormattedId', 'Name', 'Description', 'Url', 'Artifact']
490490

491491
def details(self):
492492
tank = ['%s' % self._type]
@@ -1039,7 +1039,7 @@ def augmentSchemaWithPullRequestInfo(workspace):
10391039
'RevisionHistory' : 'putrid',
10401040
'Attributes' : [],
10411041
}
1042-
pr_attr_names = [('ExternalId', 'STRING', True),
1042+
pr_attr_names = [('ExternalID', 'STRING', True),
10431043
('ExternalFormattedId', 'STRING', True),
10441044
('Name', 'STRING', True),
10451045
('Description', 'TEXT', False),

‎test/test_pull_request.py‎

Lines changed: 94 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
from rally_targets import DEFAULT_WORKSPACE, DEFAULT_PROJECT, NON_DEFAULT_PROJECT
1515
from rally_targets import ALTERNATE_WORKSPACE, ALTERNATE_PROJECT
1616

17+
AGICEN_SUB_100_USER = ''
18+
AGICEN_SUB_100_PSWD = ''
19+
AGICEN_SUB_100_API_KEY = '_37kqhjoDRf6fnZ6T1IiYXrrjcpVbTk7Llx2r7omTMQ'
20+
21+
REFABLE_ARTIFACT = 'hierarchicalrequirement/141184568124'
22+
1723
##################################################################################################
1824

1925

@@ -24,35 +30,101 @@
2430
'Name' : 'Prepare for Maven Central Deployment',
2531
'Description': 'What makes you happy about this Pull Request? Katy Perry is staying in my tent tonight!',
2632
#'Workspace' : DEFAULT_WORKSPACE,
27-
'Artifact' : 'story/123543216677' # ref to the Artifact mentioned in some commit message
33+
#'Artifact' : 'hierarchicalrequirement/81379898588' # ref to the Artifact mentioned in some commit message
34+
'Artifact' : REFABLE_ARTIFACT
2835
# CreationDate
2936
# SubscriptionID
3037
# Version
3138
# Subclass_Type
3239
}
3340

34-
def test_create_local_pull_request_instance():
35-
fake_oid = 12345698765
36-
rally = Rally(server=AGICEN, user=AGICEN_USER, password=AGICEN_PSWD)
37-
context1 = rally.contextHelper.currentContext()
38-
pr_class = classFor['PullRequest']
39-
pr = pr_class(fake_oid, dummy_data['Name'], dummy_data['Url'], context1)
40-
assert pr is not None
41-
assert pr.oid == fake_oid
42-
assert pr.Name == dummy_data['Name']
43-
hydrateAnInstance(context1, dummy_data, existingInstance=pr)
44-
assert pr.ExternalId == dummy_data['ExternalId']
45-
assert pr.ExternalFormattedId == dummy_data['ExternalFormattedId']
46-
assert pr.Url == dummy_data['Url']
47-
assert pr.Description == dummy_data['Description']
48-
assert pr.Workspace == DEFAULT_WORKSPACE
41+
#TESTN = 'kbiz.testn.f4tech.com'
42+
#TESTN_USER = '[email protected]'
43+
#TESTN_PSWD = 'Password'
44+
#
45+
# def test_create_local_pull_request_instance():
46+
# fake_oid = 12345698765
47+
#
48+
# rally = Rally(server=AGICEN, user=AGICEN_USER, password=AGICEN_PSWD)
49+
# context1 = rally.contextHelper.currentContext()
50+
# pr_class = classFor['PullRequest']
51+
# pr = pr_class(fake_oid, dummy_data['Name'], dummy_data['Url'], context1)
52+
# assert pr is not None
53+
# assert pr.oid == fake_oid
54+
# assert pr.Name == dummy_data['Name']
55+
# hydrateAnInstance(context1, dummy_data, existingInstance=pr)
56+
# assert pr.ExternalId == dummy_data['ExternalId']
57+
# assert pr.ExternalFormattedId == dummy_data['ExternalFormattedId']
58+
# assert pr.Url == dummy_data['Url']
59+
# assert pr.Description == dummy_data['Description']
60+
# assert pr.Workspace == DEFAULT_WORKSPACE
61+
4962

5063
def test_post_pull_request():
5164
expectedErrMsg = '422 Requested type name "pullrequest" is unknown.'
52-
rally = Rally(server=AGICEN, user=AGICEN_USER, password=AGICEN_PSWD)
53-
with py.test.raises(RallyRESTAPIError) as excinfo:
54-
rally.create('PullRequest', dummy_data)
55-
actualErrVerbiage = excinfo.value.args[0] # becuz Python2.6 deprecates message :-(
56-
assert excinfo.value.__class__.__name__ == 'RallyRESTAPIError'
57-
assert expectedErrMsg == actualErrVerbiage
65+
#rally = Rally(server=TESTN, user=TESTN_USER, password=TESTN_PSWD)
66+
#rally = Rally(server=AGICEN, user=AGICEN_USER, password=AGICEN_PSWD)
67+
rally = Rally(server=AGICEN, apikey=AGICEN_SUB_100_API_KEY)
68+
#with py.test.raises(RallyRESTAPIError) as excinfo:
69+
pr = rally.create('PullRequest', dummy_data, project=None)
70+
assert pr is not None
71+
assert pr.oid
72+
#actualErrVerbiage = excinfo.value.args[0] # becuz Python2.6 deprecates message :-(
73+
#assert excinfo.value.__class__.__name__ == 'RallyRESTAPIError'
74+
#assert expectedErrMsg == actualErrVerbiage
75+
76+
def test_query_pull_requests():
77+
#rally = Rally(server=AGICEN, user=AGICEN_USER, password=AGICEN_PSWD)
78+
#rally = Rally(server=TESTN, user=TESTN_USER, password=TESTN_PSWD)
79+
rally = Rally(server=AGICEN, apikey=AGICEN_SUB_100_API_KEY)
80+
attrs = "ExternalId,ExternalFormattedId,Artifact,Name,Url,Description"
81+
response = rally.get('PullRequest', fetch=attrs, project=None)
82+
assert response.status_code == 200
83+
assert len(response.errors) == 0
84+
assert len(response.warnings) == 0
85+
prs = [pr for pr in response]
86+
assert len(prs) > 0
87+
assert prs[0].Artifact
88+
assert prs[0].Artifact.__class__.__name__ == 'HierarchicalRequirement'
89+
print (prs[0].Artifact.oid)
90+
print(prs[0].details())
91+
92+
# def test_creation_date_query():
93+
# rally = Rally(server=AGICEN, apikey=AGICEN_SUB_100_API_KEY)
94+
# ref_time_iso = '2017-08-30T14:00:00.000Z'
95+
# attrs = "ExternalId,ExternalFormattedId,Artifact,Name,Url,Description"
96+
# selectors = ['CreationDate >= %s' % ref_time_iso]
97+
# response1 = rally.get('PullRequest', fetch=attrs, query=selectors, project=None)
98+
# assert response1.status_code == 200
99+
# assert len(response1.errors) == 0
100+
# assert len(response1.warnings) == 0
101+
# prs1 = [pr for pr in response1]
102+
#
103+
# response2 = rally.get('PullRequest', fetch=attrs, project=None)
104+
# assert response1.status_code == 200
105+
# assert len(response1.errors) == 0
106+
# assert len(response1.warnings) == 0
107+
# prs2 = [pr for pr in response2]
108+
#
109+
# assert len(prs1) < len(prs2)
110+
111+
112+
def test_delete_pull_request():
113+
#rally = Rally(server=TESTN, user=TESTN_USER, password=TESTN_PSWD)
114+
rally = Rally(server=AGICEN, apikey=AGICEN_SUB_100_API_KEY)
115+
attrs = "ExternalId,ExternalFormattedId,Artifact,Name,Url,Description"
116+
response = rally.get('PullRequest', fetch=attrs, project=None)
117+
assert response.status_code == 200
118+
assert len(response.errors) == 0
119+
assert len(response.warnings) == 0
120+
prs = [pr for pr in response]
121+
assert len(prs) > 0
122+
victim = prs[0]
123+
result = rally.delete('PullRequest', victim.oid, project=None)
124+
assert result == True
125+
126+
response = rally.get('PullRequest', fetch=attrs, query='ObjectID = %s' % victim.oid)
127+
ghosts = [pr for pr in response]
128+
assert not ghosts
129+
58130

0 commit comments

Comments
 (0)