#4341 Fix python2 unittests
Merged 2 months ago by tkopecek. Opened 2 months ago by jcupova.
jcupova/koji issue-4340  into  master

@@ -4,14 +4,12 @@ 

  except ImportError:

      import mock

  import os

- import rpm

  import shutil

  import tempfile

  import unittest

  import koji

  import koji.tasks

  from .loadkojid import kojid

- from six.moves import range

  

  

  class TestChooseTaskarch(unittest.TestCase):
@@ -32,7 +30,7 @@ 

          method = 'newRepo'

          params = ['TAG']

          self.handler = kojid.NewRepoTask(task_id, method, params, self.session,

-                 self.options, self.tempdir + '/work')

+                                          self.options, self.tempdir + '/work')

  

          # mock some more things

          self.wait = mock.MagicMock()
@@ -49,9 +47,9 @@ 

          os.makedirs(self.topdir + '/repos/TAG/REPOID')

          arches = ['x86_64', 'aarch64']

          for arch in arches:

-             os.makedirs(f'{self.topdir}/repos/TAG/REPOID/{arch}')

+             os.makedirs('%s/repos/TAG/REPOID/%s' % (self.topdir, arch))

              # touch pkglist

-             with open(f'{self.topdir}/repos/TAG/REPOID/{arch}/pkglist', 'wt') as fo:

+             with open('%s/repos/TAG/REPOID/%s/pkglist' % (self.topdir, arch), 'wt') as fo:

                  fo.write('fake-1.2.3-1.rpm\n')

  

          result = self.handler.run()
@@ -78,15 +76,6 @@ 

          self.assertEqual(result, (None, None))

          self.session.getRepo.assert_not_called()

  

-     def test_oldrepo_no_update(self):

Why is this test deleted?

-         taginfo = {'id': 'TAGID', 'name': 'TAG'}

-         self.options.createrepo_update = False

- 

-         result = self.handler.get_old_repo(taginfo)

- 

-         self.assertEqual(result, (None, None))

-         self.session.getRepo.assert_not_called()

- 

      def test_oldrepo_simple(self):

          taginfo = {'id': 'TAGID', 'name': 'TAG'}

          repo = {'id': 'OLDREPOID', 'tag_id': 'TAGID'}

rebased onto 30cc206

2 months ago

Metadata Update from @tkopecek:
- Pull-request tagged with: no_qe

2 months ago

Commit 33a76af fixes this pull-request

Pull-Request has been merged by tkopecek

2 months ago
Metadata