robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove usage of unittest2 on Python 3

Browse source 
It was needed to provide assertItemsEqual method. Starting with Python
3.2, there's assertCountEqual that does the same thing. Six provides a
helper that will dispatch to the existing method. With this change,
unittest 2 is only needed on Python 2.6 to backport the method.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-10-04 14:45:03 +02:00
parent 43fb06e00f
commit 2f54745715
32 changed files with 2682 additions and 1923 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/test_gather_source_module.py
View file

@ -6,6 +6,7 @@ except ImportError:
import unittest
import mock
import six
import os
import sys
@ -41,8 +42,8 @@ class TestGatherSourceModule(helpers.PungiTestCase):
def test_without_modules(self):
source = GatherSourceModule(self.compose)
packages, groups = source("x86_64", self.compose.variants["Server"])
self.assertItemsEqual(packages, [])
self.assertItemsEqual(groups, [])
self.assertEqual(packages, set())
self.assertEqual(groups, set())
def test_include_two_packages(self):
self.compose.variants["Server"].add_fake_module(
@ -57,11 +58,12 @@ class TestGatherSourceModule(helpers.PungiTestCase):
source = GatherSourceModule(self.compose)
packages, groups = source("x86_64", self.compose.variants["Server"])
self.assertItemsEqual(
six.assertCountEqual(
self,
[(rpm[0].nevra, rpm[1]) for rpm in packages],
[("pkg-0:1.0.0-1.x86_64", None), ("pkg-0:1.0.0-1.i686", None)],
)
self.assertItemsEqual(groups, [])
self.assertEqual(groups, set())
def test_does_not_include_unlisted(self):
self.compose.variants["Server"].add_fake_module(
@ -75,5 +77,5 @@ class TestGatherSourceModule(helpers.PungiTestCase):
source = GatherSourceModule(self.compose)
packages, groups = source("x86_64", self.compose.variants["Server"])
self.assertItemsEqual(packages, [])
self.assertItemsEqual(groups, [])
self.assertEqual(packages, set())
self.assertEqual(groups, set())