Skip to content

Commit 9b11c5b

Browse files
vshlapakovvshlapakov
committed
Fix tests after renaming
1 parent e7a6cec commit 9b11c5b

File tree

7 files changed

+75
-75
lines changed

7 files changed

+75
-75
lines changed

‎tests/client/test_items.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def _add_test_items(job):
1414

1515

1616
def test_items_iter(spider):
17-
job = spider.jobs.schedule(meta={'state': 'running'})
17+
job = spider.jobs.run(meta={'state': 'running'})
1818
_add_test_items(job)
1919

2020
o = job.items.iter()
@@ -43,7 +43,7 @@ def test_items_iter(spider):
4343

4444

4545
def test_items_list(spider):
46-
job = spider.jobs.schedule(meta={'state': 'running'})
46+
job = spider.jobs.run(meta={'state': 'running'})
4747
_add_test_items(job)
4848

4949
o = job.items.list()

‎tests/client/test_job.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
def test_job_base(client, spider):
15-
job = spider.jobs.schedule()
15+
job = spider.jobs.run()
1616
assert isinstance(job, Job)
1717
assert job.project_id == TEST_PROJECT_ID
1818
assert job.key.startswith(spider.key)
@@ -25,10 +25,10 @@ def test_job_base(client, spider):
2525

2626

2727
def test_job_update_tags(spider):
28-
job1 = spider.jobs.schedule(job_args={'subid': 'tags-1'},
29-
add_tag=['tag1'])
30-
job2 = spider.jobs.schedule(job_args={'subid': 'tags-2'},
31-
add_tag=['tag2'])
28+
job1 = spider.jobs.run(job_args={'subid': 'tags-1'},
29+
add_tag=['tag1'])
30+
job2 = spider.jobs.run(job_args={'subid': 'tags-2'},
31+
add_tag=['tag2'])
3232
job1.update_tags(add=['tagA1', 'tagA2'])
3333
assert job1.metadata.get('tags') == ['tag1', 'tagA1', 'tagA2']
3434

@@ -43,7 +43,7 @@ def test_job_update_tags(spider):
4343

4444

4545
def test_job_start(spider):
46-
job = spider.jobs.schedule()
46+
job = spider.jobs.run()
4747
assert job.metadata.get('state') == 'pending'
4848
job.start()
4949
assert job.metadata.get('state') == 'running'
@@ -54,7 +54,7 @@ def test_job_start(spider):
5454

5555

5656
def test_job_start_extras(spider):
57-
job = spider.jobs.schedule()
57+
job = spider.jobs.run()
5858
extras = {
5959
'string': 'foo',
6060
'integer': 1,
@@ -76,7 +76,7 @@ def test_job_start_extras(spider):
7676

7777

7878
def test_job_update(spider):
79-
job = spider.jobs.schedule()
79+
job = spider.jobs.run()
8080
assert job.metadata.get('state') == 'pending'
8181
job.update(state='running', foo='bar')
8282

@@ -86,14 +86,14 @@ def test_job_update(spider):
8686

8787

8888
def test_job_cancel_pending(spider):
89-
job = spider.jobs.schedule()
89+
job = spider.jobs.run()
9090
assert job.metadata.get('state') == 'pending'
9191
job.cancel()
9292
assert job.metadata.get('state') == 'finished'
9393

9494

9595
def test_job_cancel_running(spider):
96-
job = spider.jobs.schedule()
96+
job = spider.jobs.run()
9797
job.start()
9898
assert job.metadata.get('state') == 'running'
9999
job.cancel()
@@ -102,14 +102,14 @@ def test_job_cancel_running(spider):
102102

103103

104104
def test_job_finish(spider):
105-
job = spider.jobs.schedule()
105+
job = spider.jobs.run()
106106
assert job.metadata.get('state') == 'pending'
107107
job.finish()
108108
assert job.metadata.get('state') == 'finished'
109109

110110

111111
def test_job_finish_with_metadata(spider):
112-
job = spider.jobs.schedule(meta={'meta1': 'val1', 'meta2': 'val3'})
112+
job = spider.jobs.run(meta={'meta1': 'val1', 'meta2': 'val3'})
113113
assert job.metadata.get('state') == 'pending'
114114
job.finish(meta2='val2', meta3='val3')
115115
assert job.metadata.get('state') == 'finished'
@@ -119,15 +119,15 @@ def test_job_finish_with_metadata(spider):
119119

120120

121121
def test_job_delete(spider):
122-
job = spider.jobs.schedule(meta={'state': 'finished'})
122+
job = spider.jobs.run(meta={'state': 'finished'})
123123
assert job.metadata.get('state') == 'finished'
124124
job.delete()
125125
assert job.metadata.get('state') == 'deleted'
126126

127127

128128
def test_job_delete_with_metadata(spider):
129129
meta = {'state': 'finished', 'meta1': 'val1', 'meta2': 'val3'}
130-
job = spider.jobs.schedule(meta=meta)
130+
job = spider.jobs.run(meta=meta)
131131
assert job.metadata.get('state') == 'finished'
132132
job.delete(meta2='val2', meta3='val3')
133133
assert job.metadata.get('state') == 'deleted'
@@ -137,15 +137,15 @@ def test_job_delete_with_metadata(spider):
137137

138138

139139
def test_metadata_update(spider):
140-
job = spider.jobs.schedule(meta={'meta1': 'data1'})
140+
job = spider.jobs.run(meta={'meta1': 'data1'})
141141
assert job.metadata.get('meta1') == 'data1'
142142
job.metadata.update({'meta1': 'data2', 'meta2': 'data3'})
143143
assert job.metadata.get('meta1') == 'data2'
144144
assert job.metadata.get('meta2') == 'data3'
145145

146146

147147
def test_metadata_set(spider):
148-
job = spider.jobs.schedule(meta={'meta1': 'data1'})
148+
job = spider.jobs.run(meta={'meta1': 'data1'})
149149
assert job.metadata.get('meta1') == 'data1'
150150
job.metadata.set('meta1', 'data2')
151151
job.metadata.set('meta2', 123)
@@ -154,14 +154,14 @@ def test_metadata_set(spider):
154154

155155

156156
def test_metadata_delete(spider):
157-
job = spider.jobs.schedule(meta={'meta1': 'data1', 'meta2': 'data2'})
157+
job = spider.jobs.run(meta={'meta1': 'data1', 'meta2': 'data2'})
158158
job.metadata.delete('meta1')
159159
assert job.metadata.get('meta1') is None
160160
assert job.metadata.get('meta2') == 'data2'
161161

162162

163163
def test_metadata_iter_list(spider):
164-
job = spider.jobs.schedule(meta={'meta1': 'data1', 'meta2': 'data2'})
164+
job = spider.jobs.run(meta={'meta1': 'data1', 'meta2': 'data2'})
165165
meta_iter = job.metadata.iter()
166166
assert isinstance(meta_iter, Iterator)
167167
meta_list = job.metadata.list()

‎tests/client/test_logs.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def _add_test_logs(job):
2929

3030

3131
def test_logs_base(spider):
32-
job = spider.jobs.schedule()
32+
job = spider.jobs.run()
3333
assert list(job.logs.iter()) == []
3434
assert job.logs.batch_write_start() == 0
3535
_add_test_logs(job)
@@ -45,7 +45,7 @@ def test_logs_base(spider):
4545

4646

4747
def test_logs_iter(spider):
48-
job = spider.jobs.schedule()
48+
job = spider.jobs.run()
4949
_add_test_logs(job)
5050

5151
logs1 = job.logs.iter()
@@ -67,7 +67,7 @@ def test_logs_iter(spider):
6767

6868

6969
def test_logs_list(spider):
70-
job = spider.jobs.schedule()
70+
job = spider.jobs.run()
7171
_add_test_logs(job)
7272

7373
logs1 = job.logs.list()
@@ -90,7 +90,7 @@ def test_logs_list(spider):
9090

9191

9292
def test_logs_list_filter(spider):
93-
job = spider.jobs.schedule()
93+
job = spider.jobs.run()
9494
_add_test_logs(job)
9595

9696
logs1 = job.logs.list(filter='["message", "contains", ["simple"]]')
@@ -106,7 +106,7 @@ def test_logs_list_filter(spider):
106106

107107

108108
def test_logs_iter_raw_json(spider):
109-
job = spider.jobs.schedule()
109+
job = spider.jobs.run()
110110
_add_test_logs(job)
111111

112112
logs0 = job.logs.iter_raw_json(offset=2)
@@ -124,7 +124,7 @@ def test_logs_iter_raw_json(spider):
124124

125125

126126
def test_logs_iter_raw_msgpack(spider):
127-
job = spider.jobs.schedule()
127+
job = spider.jobs.run()
128128
_add_test_logs(job)
129129

130130
logs1 = job.logs.iter_raw_msgpack(offset=2)

‎tests/client/test_projects.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def test_projects_list_server_error(client):
5858

5959
def test_projects_summary(client, project):
6060
# add at least one running or pending job to ensure summary is returned
61-
project.jobs.schedule(TEST_SPIDER_NAME, meta={'state': 'running'})
61+
project.jobs.run(TEST_SPIDER_NAME, meta={'state': 'running'})
6262

6363
def _get_summary():
6464
summaries = {str(js['project']): js
@@ -91,19 +91,19 @@ def test_project_jobs_count(project):
9191
assert project.jobs.count() == 0
9292
assert project.jobs.count(state=['pending', 'running', 'finished']) == 0
9393

94-
project.jobs.schedule(TEST_SPIDER_NAME)
94+
project.jobs.run(TEST_SPIDER_NAME)
9595
assert project.jobs.count(state='pending') == 1
9696

9797
for i in range(2):
98-
project.jobs.schedule(TEST_SPIDER_NAME,
99-
spider_args={'subid': 'running-%s' % i},
100-
meta={'state': 'running'})
98+
project.jobs.run(TEST_SPIDER_NAME,
99+
job_args={'subid': 'running-%s' % i},
100+
meta={'state': 'running'})
101101
assert project.jobs.count(state='running') == 2
102102

103103
for i in range(3):
104-
project.jobs.schedule(TEST_SPIDER_NAME,
105-
spider_args={'subid': 'finished%s' % i},
106-
meta={'state': 'finished'})
104+
project.jobs.run(TEST_SPIDER_NAME,
105+
job_args={'subid': 'finished%s' % i},
106+
meta={'state': 'finished'})
107107
assert project.jobs.count(state='finished') == 3
108108

109109
assert project.jobs.count(state=['pending', 'running', 'finished']) == 6
@@ -114,7 +114,7 @@ def test_project_jobs_count(project):
114114

115115

116116
def test_project_jobs_iter(project):
117-
project.jobs.schedule(TEST_SPIDER_NAME, meta={'state': 'running'})
117+
project.jobs.run(TEST_SPIDER_NAME, meta={'state': 'running'})
118118

119119
# no finished jobs
120120
jobs0 = project.jobs.iter()
@@ -141,7 +141,7 @@ def test_project_jobs_iter(project):
141141

142142

143143
def test_project_jobs_list(project):
144-
project.jobs.schedule(TEST_SPIDER_NAME, meta={'state': 'running'})
144+
project.jobs.run(TEST_SPIDER_NAME, meta={'state': 'running'})
145145

146146
# no finished jobs
147147
jobs0 = project.jobs.list()
@@ -164,12 +164,12 @@ def test_project_jobs_list(project):
164164
assert job.get('state') == 'running'
165165

166166

167-
def test_project_jobs_schedule(project):
167+
def test_project_jobs_run(project):
168168
# scheduling on project level requires spidername
169169
with pytest.raises(ValueError):
170-
project.jobs.schedule()
170+
project.jobs.run()
171171

172-
job0 = project.jobs.schedule(TEST_SPIDER_NAME)
172+
job0 = project.jobs.run(TEST_SPIDER_NAME)
173173
assert isinstance(job0, Job)
174174
validate_default_meta(job0.metadata, state='pending')
175175
assert isinstance(job0.metadata.get('pending_time'), int)
@@ -178,13 +178,13 @@ def test_project_jobs_schedule(project):
178178

179179
# running the same spider with same args leads to duplicate error
180180
with pytest.raises(DuplicateJobError):
181-
project.jobs.schedule(TEST_SPIDER_NAME)
181+
project.jobs.run(TEST_SPIDER_NAME)
182182

183-
job1 = project.jobs.schedule(TEST_SPIDER_NAME,
184-
spider_args={'arg1': 'val1', 'arg2': 'val2'},
185-
priority=3, units=3,
186-
add_tag=['tagA', 'tagB'],
187-
meta={'state': 'running', 'meta1': 'val1'})
183+
job1 = project.jobs.run(TEST_SPIDER_NAME,
184+
job_args={'arg1': 'val1', 'arg2': 'val2'},
185+
priority=3, units=3,
186+
add_tag=['tagA', 'tagB'],
187+
meta={'state': 'running', 'meta1': 'val1'})
188188
assert isinstance(job1, Job)
189189
meta = job1.metadata
190190
validate_default_meta(meta, state='running', units=3, priority=3,
@@ -214,9 +214,9 @@ def test_project_jobs_summary(project):
214214
jobs = defaultdict(list)
215215
for state in sorted(counts):
216216
for i in range(counts[state]):
217-
job = project.jobs.schedule(TEST_SPIDER_NAME,
218-
spider_args={'subid': state + str(i)},
219-
meta={'state': state})
217+
job = project.jobs.run(TEST_SPIDER_NAME,
218+
job_args={'subid': state + str(i)},
219+
meta={'state': state})
220220
jobs[state].append(job.key)
221221
summary1 = project.jobs.summary()
222222
for summ in summary1:
@@ -248,7 +248,7 @@ def test_project_jobs_iter_last(project):
248248
assert isinstance(lastsumm0, types.GeneratorType)
249249
assert list(lastsumm0) == []
250250

251-
job1 = project.jobs.schedule(TEST_SPIDER_NAME, meta={'state': 'finished'})
251+
job1 = project.jobs.run(TEST_SPIDER_NAME, meta={'state': 'finished'})
252252
lastsumm1 = list(project.jobs.iter_last())
253253
assert len(lastsumm1) == 1
254254
assert lastsumm1[0].get('key') == job1.key
@@ -259,9 +259,9 @@ def test_project_jobs_iter_last(project):
259259
assert lastsumm1[0].get('ts') > 0
260260

261261
# next iter_last should return last spider's job
262-
job2 = project.jobs.schedule(TEST_SPIDER_NAME,
263-
spider_args={'subid': 1},
264-
meta={'state': 'finished'})
262+
job2 = project.jobs.run(TEST_SPIDER_NAME,
263+
job_args={'subid': 1},
264+
meta={'state': 'finished'})
265265
lastsumm2 = list(project.jobs.iter_last())
266266
assert len(lastsumm2) == 1
267267
assert lastsumm2[0].get('key') == job2.key

‎tests/client/test_requests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def _add_test_requests(job):
1919

2020

2121
def test_requests_iter(spider):
22-
job = spider.jobs.schedule(meta={'state': 'running'})
22+
job = spider.jobs.run(meta={'state': 'running'})
2323
_add_test_requests(job)
2424
job.requests.close()
2525
rr = job.requests.iter()
@@ -42,7 +42,7 @@ def test_requests_iter(spider):
4242

4343

4444
def test_requests_iter_raw_json(spider):
45-
job = spider.jobs.schedule()
45+
job = spider.jobs.run()
4646
_add_test_requests(job)
4747
job.requests.close()
4848

‎tests/client/test_samples.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def _add_test_samples(job):
1111

1212

1313
def test_samples_iter(spider):
14-
job = spider.jobs.schedule(meta={'state': 'running'})
14+
job = spider.jobs.run(meta={'state': 'running'})
1515
assert list(job.samples.iter()) == []
1616
_add_test_samples(job)
1717

@@ -23,7 +23,7 @@ def test_samples_iter(spider):
2323

2424

2525
def test_samples_list(spider):
26-
job = spider.jobs.schedule(meta={'state': 'running'})
26+
job = spider.jobs.run(meta={'state': 'running'})
2727
_add_test_samples(job)
2828
o = job.samples.list()
2929
assert isinstance(o, list)

0 commit comments

Comments
 (0)