Skip to content
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
26 changes: 26 additions & 0 deletions tests/errata/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from pytest import fixture
from mock import patch

from .fake_errata_tool import FakeErrataToolController
from ..koji.fake_koji import FakeKojiController


@fixture
def fake_errata_tool():
controller = FakeErrataToolController()
with patch("pushsource._impl.backend.errata_source.ServerProxy") as mock_proxy:
mock_proxy.side_effect = controller.proxy
yield controller


@fixture
def fake_koji():
controller = FakeKojiController()
with patch("koji.ClientSession") as mock_session:
mock_session.side_effect = controller.session
yield controller


@fixture
def koji_dir(tmpdir):
yield str(tmpdir.mkdir("koji"))
13 changes: 1 addition & 12 deletions tests/errata/test_errata_errors.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
from pytest import raises, fixture
from mock import patch

from .fake_errata_tool import FakeErrataToolController
from pytest import raises

from pushsource import Source, ErratumPushItem, ErratumReference, RpmPushItem


@fixture
def fake_errata_tool():
controller = FakeErrataToolController()
with patch("pushsource._impl.backend.errata_source.ServerProxy") as mock_proxy:
mock_proxy.side_effect = controller.proxy
yield controller


def test_errata_files_needs_koji_url(fake_errata_tool):
"""Can't obtain errata referring to files if koji source URL is missing"""

Expand Down
13 changes: 0 additions & 13 deletions tests/errata/test_errata_metadata.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
from pytest import raises, fixture
from mock import patch

from .fake_errata_tool import FakeErrataToolController

from pushsource import Source, ErratumPushItem, ErratumReference


@fixture
def fake_errata_tool():
controller = FakeErrataToolController()
with patch("pushsource._impl.backend.errata_source.ServerProxy") as mock_proxy:
mock_proxy.side_effect = controller.proxy
yield controller


def test_errata_typical_metadata(fake_errata_tool):
"""Test fetching an advisory with no files:

Expand Down
26 changes: 0 additions & 26 deletions tests/errata/test_errata_modules.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
from pytest import raises, fixture
from mock import patch

from .fake_errata_tool import FakeErrataToolController
from ..koji.fake_koji import FakeKojiController

from pushsource import (
Source,
Expand All @@ -16,27 +11,6 @@
)


@fixture
def fake_errata_tool():
controller = FakeErrataToolController()
with patch("pushsource._impl.backend.errata_source.ServerProxy") as mock_proxy:
mock_proxy.side_effect = controller.proxy
yield controller


@fixture
def fake_koji():
controller = FakeKojiController()
with patch("koji.ClientSession") as mock_session:
mock_session.side_effect = controller.session
yield controller


@fixture
def koji_dir(tmpdir):
yield str(tmpdir.mkdir("koji"))


def test_errata_modules_via_koji(fake_errata_tool, fake_koji, koji_dir):
"""Errata source containing a module yields modules & RPMs taken
from koji source"""
Expand Down
26 changes: 0 additions & 26 deletions tests/errata/test_errata_rpms.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
from pytest import raises, fixture
from mock import patch

from .fake_errata_tool import FakeErrataToolController
from ..koji.fake_koji import FakeKojiController

from pushsource import (
Source,
Expand All @@ -15,27 +10,6 @@
)


@fixture
def fake_errata_tool():
controller = FakeErrataToolController()
with patch("pushsource._impl.backend.errata_source.ServerProxy") as mock_proxy:
mock_proxy.side_effect = controller.proxy
yield controller


@fixture
def fake_koji():
controller = FakeKojiController()
with patch("koji.ClientSession") as mock_session:
mock_session.side_effect = controller.session
yield controller


@fixture
def koji_dir(tmpdir):
yield str(tmpdir.mkdir("koji"))


def test_errata_rpms_via_koji(fake_errata_tool, fake_koji, koji_dir):
"""Errata source yields RPMs taken from koji source"""

Expand Down