Skip to content

Rollback incremental indexing #3716

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.

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

Merged
merged 2 commits into from
Apr 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,10 @@ services:
context: .
args:
DEVEL: "yes"
command: hupper -m celery -A warehouse worker -B -S redbeat.RedBeatScheduler -l info
command: celery -A warehouse worker -B -S redbeat.RedBeatScheduler -l info
env_file: dev/environment
environment:
C_FORCE_ROOT: "1"
volumes:
- ./warehouse:/opt/warehouse/src/warehouse:z
links:
- db
- redis
Expand Down
78 changes: 0 additions & 78 deletions tests/unit/search/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,84 +14,6 @@

from warehouse import search

from ...common.db.packaging import ProjectFactory, ReleaseFactory


def test_store_projects(db_request):
project0 = ProjectFactory.create()
project1 = ProjectFactory.create()
release1 = ReleaseFactory.create(project=project1)
config = pretend.stub()
session = pretend.stub(
info={},
new={project0},
dirty=set(),
deleted={release1},
)

search.store_projects_for_project_reindex(config, session, pretend.stub())

assert session.info["warehouse.search.project_updates"] == {
project0,
project1,
}
assert session.info["warehouse.search.project_deletes"] == set()


def test_store_projects_unindex(db_request):
project0 = ProjectFactory.create()
project1 = ProjectFactory.create()
config = pretend.stub()
session = pretend.stub(
info={},
new={project0},
dirty=set(),
deleted={project1},
)

search.store_projects_for_project_reindex(config, session, pretend.stub())

assert session.info["warehouse.search.project_updates"] == {
project0,
}
assert session.info["warehouse.search.project_deletes"] == {
project1,
}


def test_execute_reindex_success(app_config):
_delay = pretend.call_recorder(lambda x: None)
app_config.task = lambda x: pretend.stub(delay=_delay)
session = pretend.stub(
info={
"warehouse.search.project_updates": {
pretend.stub(normalized_name="foo"),
},
},
)

search.execute_project_reindex(app_config, session)

assert _delay.calls == [pretend.call("foo")]
assert "warehouse.search.project_updates" not in session.info


def test_execute_unindex_success(app_config):
_delay = pretend.call_recorder(lambda x: None)
app_config.task = lambda x: pretend.stub(delay=_delay)
session = pretend.stub(
info={
"warehouse.search.project_deletes": {
pretend.stub(normalized_name="foo"),
},
},
)

search.execute_project_reindex(app_config, session)

assert _delay.calls == [pretend.call("foo")]
assert "warehouse.search.project_deletes" not in session.info


def test_es(monkeypatch):
search_obj = pretend.stub()
Expand Down
Loading