test: Update tests for 9d1a81b and 1dde28a (the poller now always loo…

…ps as many times as next() was called)

tests/test_poller.py

@@ -61,28 +61,16 @@ def test_poll_next(poller):
 
     assert hasattr(deferred1, "result")
     assert getattr(deferred1, "called", False)
-    assert not hasattr(deferred2, "result")
-    assert not getattr(deferred2, "called", False)
-
-    # os.listdir() in FilesystemEggStorage.list_projects() uses an arbitrary order.
-    project = deferred1.result["_project"]
-    queues[project].pop()
-
-    assert deferred1.result["_spider"] == scenario.pop(project)
-
-    value = poller.poll()
-
-    assert isinstance(value, Deferred)
-    assert hasattr(value, "result")
-    assert getattr(value, "called", False)
-    assert value.result is None
-
     assert hasattr(deferred2, "result")
     assert getattr(deferred2, "called", False)
 
-    project, spider = scenario.popitem()
+    # os.listdir() in FilesystemEggStorage.list_projects() uses an arbitrary order.
+    project_a = deferred1.result["_project"]
+    spider_a = scenario.pop(project_a)
+    project_b, spider_b = scenario.popitem()
 
-    assert deferred2.result == {"_project": project, "_spider": spider}
+    assert deferred1.result["_spider"] == spider_a
+    assert deferred2.result == {"_project": project_b, "_spider": spider_b}
 
 
 def test_poll_empty(poller):

tests/test_webservice.py

@@ -493,9 +493,12 @@ def test_schedule(txrequest, root, args, run_only_if_has_settings):
     assert re.search(r"^[a-z0-9]{32}$", jobid)
 
     jobs = root.poller.queues[project].list()
+    expected = {"name": spider, "_job": jobid, "settings": {}}
+    if version:
+        expected["_version"] = version
 
     assert len(jobs) == 1
-    assert jobs[0] == {"name": spider, "_version": version, "_job": jobid, "settings": {}}
+    assert jobs[0] == expected
 
 
 def test_schedule_parameters(txrequest, root_with_egg):