Merge PR#242 Make tests compatible with rhel7/centos7
Merges #242 https://pagure.io/koji/pull-request/242
This commit is contained in:
Mike McLean
commit
cc51c11aa7
6 changed files with 10497 additions and 10486 deletions
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,39 +1,41 @@
|
|||
[call.groupListAdd('tag', u'additional-devel', biarchonly=True, description=u'Additional development headers and libraries for developing applications', display_name=u'Additional Development', force=None, is_default=False, langonly=u'fr', uservisible=False),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'alsa-lib-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'audit-libs-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'binutils-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'boost-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'bzip2-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'additional-devel', u'cyrus-sasl-devel', basearchonly=False, force=None, type='default'),
|
||||
call.groupListAdd('tag', u'backup-client', biarchonly=False, description=u'Client tools for connecting to a backup server and doing backups.', display_name=u'Backup Client', force=None, is_default=True, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', u'backup-client', u'amanda-client', basearchonly=False, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'backup-client', u'bacula-client', basearchonly=False, force=None, type='optional'),
|
||||
call.groupListAdd('tag', u'backup-server', biarchonly=False, description=u"Software to centralize your infrastructure's backups.", display_name=u'Backup Server', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', u'backup-server', u'amanda-server', basearchonly=False, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'backup-server', u'mt-st', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'backup-server', u'mtx', basearchonly=False, force=None, type='optional'),
|
||||
call.groupListAdd('tag', u'ansible-node', biarchonly=False, description=None, display_name=u'Ansible node', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', u'ansible-node', u'python2-dnf', basearchonly=False, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'ansible-node', u'libselinux-python', basearchonly=False, force=None, requires=u'selinux-policy', type='conditional'),
|
||||
call.groupListAdd('tag', u'd-development', biarchonly=False, description=u'These include development tools and libraries such as ldc, and geany-tag.', display_name=u'D Development Tools and Libraries', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'ldc', basearchonly=True, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'ldc-druntime', basearchonly=True, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'ldc-druntime-devel', basearchonly=True, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'ldc-phobos-devel', basearchonly=True, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'make', basearchonly=False, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'pkgconfig', basearchonly=False, force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'ctags', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'indent', basearchonly=False, force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'astyle', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'cmake', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'derelict-devel', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'geany', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'gl3n-devel', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'insight', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'nemiver', basearchonly=False, force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', u'd-development', u'uncrustify', basearchonly=False, force=None, type='optional'),
|
||||
call.groupListAdd('tag', u'empty-group-1', biarchonly=False, description=u'empty group 1 desc', display_name=u'empty group 1', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupListAdd('tag', u'empty-group-2', biarchonly=False, description=u'empty group 2 desc', display_name=u'empty group 2', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupListAdd('tag', u'unknown-group', biarchonly=False, description=u'unknown group desc', display_name=u'unknown group', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', u'unknown-group', u'unknown', basearchonly=False, force=None, type='unknown'),
|
||||
call.groupPackageListAdd('tag', u'unknown-group', u'unknown2', basearchonly=False, force=None, type='unknown')]
|
||||
[
|
||||
[ "groupListAdd", [ "tag", "additional-devel" ], { "force": null, "description": "Additional development headers and libraries for developing applications", "uservisible": false, "is_default": false, "biarchonly": true, "display_name": "Additional Development", "langonly": "fr" } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "alsa-lib-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "audit-libs-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "binutils-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "boost-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "bzip2-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "cyrus-sasl-devel" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupListAdd", [ "tag", "backup-client" ], { "force": null, "description": "Client tools for connecting to a backup server and doing backups.", "uservisible": true, "is_default": true, "biarchonly": false, "display_name": "Backup Client", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-client", "amanda-client" ], { "type": "mandatory", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-client", "bacula-client" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupListAdd", [ "tag", "backup-server" ], { "force": null, "description": "Software to centralize your infrastructure's backups.", "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "Backup Server", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "amanda-server" ], { "type": "mandatory", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "mt-st" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "mtx" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupListAdd", [ "tag", "ansible-node" ], { "force": null, "description": null, "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "Ansible node", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "ansible-node", "python2-dnf" ], { "type": "mandatory", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "ansible-node", "libselinux-python" ], { "force": null, "requires": "selinux-policy", "basearchonly": false, "type": "conditional" } ],
|
||||
[ "groupListAdd", [ "tag", "d-development" ], { "force": null, "description": "These include development tools and libraries such as ldc, and geany-tag.", "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "D Development Tools and Libraries", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc" ], { "type": "mandatory", "force": null, "basearchonly": true } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-druntime" ], { "type": "mandatory", "force": null, "basearchonly": true } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-druntime-devel" ], { "type": "mandatory", "force": null, "basearchonly": true } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-phobos-devel" ], { "type": "mandatory", "force": null, "basearchonly": true } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "make" ], { "type": "mandatory", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "pkgconfig" ], { "type": "mandatory", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ctags" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "indent" ], { "type": "default", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "astyle" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "cmake" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "derelict-devel" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "geany" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "gl3n-devel" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "insight" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "nemiver" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "uncrustify" ], { "type": "optional", "force": null, "basearchonly": false } ],
|
||||
[ "groupListAdd", [ "tag", "empty-group-1" ], { "force": null, "description": "empty group 1 desc", "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "empty group 1", "langonly": null } ],
|
||||
[ "groupListAdd", [ "tag", "empty-group-2" ], { "force": null, "description": "empty group 2 desc", "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "empty group 2", "langonly": null } ],
|
||||
[ "groupListAdd", [ "tag", "unknown-group" ], { "force": null, "description": "unknown group desc", "uservisible": true, "is_default": false, "biarchonly": false, "display_name": "unknown group", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "unknown-group", "unknown" ], { "type": "unknown", "force": null, "basearchonly": false } ],
|
||||
[ "groupPackageListAdd", [ "tag", "unknown-group", "unknown2" ], { "type": "unknown", "force": null, "basearchonly": false } ]
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,37 +1,39 @@
|
|||
[call.groupListAdd('tag', 'additional-devel', description='Additional development headers and libraries for developing applications', display_name='Additional Development', force=None, is_default=False, langonly='fr', uservisible=False),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'binutils-devel', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'boost-devel', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'bzip2-devel', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'cyrus-sasl-devel', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'audit-libs-devel', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'additional-devel', 'alsa-lib-devel', force=None, type='default'),
|
||||
call.groupListAdd('tag', 'ansible-node', description='', display_name='Ansible node', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', 'ansible-node', 'python2-dnf', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'ansible-node', 'libselinux-python', force=None, requires='selinux-policy', type='conditional'),
|
||||
call.groupListAdd('tag', 'backup-client', description='Client tools for connecting to a backup server and doing backups.', display_name='Backup Client', force=None, is_default=True, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', 'backup-client', 'amanda-client', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'backup-client', 'bacula-client', force=None, type='optional'),
|
||||
call.groupListAdd('tag', 'backup-server', description="Software to centralize your infrastructure's backups.", display_name='Backup Server', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', 'backup-server', 'amanda-server', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'backup-server', 'mtx', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'backup-server', 'mt-st', force=None, type='optional'),
|
||||
call.groupListAdd('tag', 'd-development', description='These include development tools and libraries such as ldc, and geany-tag.', display_name='D Development Tools and Libraries', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'ldc', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'ldc-druntime', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'make', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'pkgconfig', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'ldc-phobos-devel', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'ldc-druntime-devel', force=None, type='mandatory'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'ctags', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'indent', force=None, type='default'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'geany', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'cmake', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'derelict-devel', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'insight', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'nemiver', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'gl3n-devel', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'astyle', force=None, type='optional'),
|
||||
call.groupPackageListAdd('tag', 'd-development', 'uncrustify', force=None, type='optional'),
|
||||
call.groupListAdd('tag', 'empty-group-1', description='empty group 1 desc', display_name='empty group 1', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupListAdd('tag', 'empty-group-2', description='empty group 2 desc', display_name='empty group 2', force=None, is_default=False, langonly=None, uservisible=True),
|
||||
call.groupListAdd('tag', 'unknown-group', description='unknown group desc', display_name='unknown group', force=None, is_default=False, langonly=None, uservisible=True)]
|
||||
[
|
||||
[ "groupListAdd", [ "tag", "additional-devel" ], { "force": null, "description": "Additional development headers and libraries for developing applications", "uservisible": false, "is_default": false, "display_name": "Additional Development", "langonly": "fr" } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "binutils-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "boost-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "bzip2-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "cyrus-sasl-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "audit-libs-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "additional-devel", "alsa-lib-devel" ], { "type": "default", "force": null } ],
|
||||
[ "groupListAdd", [ "tag", "ansible-node" ], { "force": null, "description": "", "uservisible": true, "is_default": false, "display_name": "Ansible node", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "ansible-node", "python2-dnf" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "ansible-node", "libselinux-python" ], { "force": null, "requires": "selinux-policy", "type": "conditional" } ],
|
||||
[ "groupListAdd", [ "tag", "backup-client" ], { "force": null, "description": "Client tools for connecting to a backup server and doing backups.", "uservisible": true, "is_default": true, "display_name": "Backup Client", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-client", "amanda-client" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-client", "bacula-client" ], { "type": "optional", "force": null } ],
|
||||
[ "groupListAdd", [ "tag", "backup-server" ], { "force": null, "description": "Software to centralize your infrastructure's backups.", "uservisible": true, "is_default": false, "display_name": "Backup Server", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "amanda-server" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "mtx" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "backup-server", "mt-st" ], { "type": "optional", "force": null } ],
|
||||
[ "groupListAdd", [ "tag", "d-development" ], { "force": null, "description": "These include development tools and libraries such as ldc, and geany-tag.", "uservisible": true, "is_default": false, "display_name": "D Development Tools and Libraries", "langonly": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-druntime" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "make" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "pkgconfig" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-phobos-devel" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ldc-druntime-devel" ], { "type": "mandatory", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "ctags" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "indent" ], { "type": "default", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "geany" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "cmake" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "derelict-devel" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "insight" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "nemiver" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "gl3n-devel" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "astyle" ], { "type": "optional", "force": null } ],
|
||||
[ "groupPackageListAdd", [ "tag", "d-development", "uncrustify" ], { "type": "optional", "force": null } ],
|
||||
[ "groupListAdd", [ "tag", "empty-group-1" ], { "force": null, "description": "empty group 1 desc", "uservisible": true, "is_default": false, "display_name": "empty group 1", "langonly": null } ],
|
||||
[ "groupListAdd", [ "tag", "empty-group-2" ], { "force": null, "description": "empty group 2 desc", "uservisible": true, "is_default": false, "display_name": "empty group 2", "langonly": null } ],
|
||||
[ "groupListAdd", [ "tag", "unknown-group" ], { "force": null, "description": "unknown group desc", "uservisible": true, "is_default": false, "display_name": "unknown group", "langonly": null } ]
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
import json
|
||||
import unittest
|
||||
|
||||
import StringIO as stringio
|
||||
|
||||
import os
|
||||
|
||||
import sys
|
||||
|
||||
import mock
|
||||
|
||||
import loadcli
|
||||
|
||||
try:
|
||||
|
|
@ -304,10 +300,16 @@ class TestImportComps(unittest.TestCase):
|
|||
with open(stdout_file, 'rb') as f:
|
||||
expected = f.read().decode('ascii')
|
||||
self.assertMultiLineEqual(stdout.getvalue(), expected)
|
||||
# compare mock_calls by literal string
|
||||
with open(calls_file, 'rb') as f:
|
||||
expected = f.read().decode('ascii')
|
||||
self.assertMultiLineEqual(str(session.mock_calls) + '\n', expected)
|
||||
|
||||
# compare mock_calls stored as json
|
||||
expected = []
|
||||
for c in json.load(open(calls_file, 'rt')):
|
||||
expected.append(getattr(mock.call, c[0]).__call__(*c[1], **c[2]))
|
||||
|
||||
if hasattr(session, 'assertHasCalls'):
|
||||
session.assertHasCalls(expected)
|
||||
else:
|
||||
session.assert_has_calls(expected)
|
||||
self.assertNotEqual(rv, 1)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,8 @@ class TasksTestCase(TestCase):
|
|||
fake_mounts_file_contents = get_fake_mounts_file()
|
||||
|
||||
with patch('{0}.open'.format(__name__), return_value=fake_mounts_file_contents, create=True):
|
||||
self.assertEquals(scan_mounts('/dev'), ['/dev/shm', '/dev/pts', '/dev/mqueue', '/dev/hugepages', '/dev'])
|
||||
self.assertIn(scan_mounts('/dev'), [['/dev/shm', '/dev/pts', '/dev/mqueue', '/dev/hugepages', '/dev'],
|
||||
['/dev/shm', '/dev/pts', '/dev/mqueue', '/dev/console', '/dev']])
|
||||
|
||||
def test_scan_mounts_no_results(self):
|
||||
""" Tests the scan_mounts function with a mocked /proc/mounts file. An argument of /nonexistent/path
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue