Hello community, here is the log from the commit of package python3-ipa for openSUSE:Factory checked in at 2019-03-18 10:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-ipa (Old) and /work/SRC/openSUSE:Factory/.python3-ipa.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-ipa" Mon Mar 18 10:42:55 2019 rev:15 rq:685768 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python3-ipa/python3-ipa.changes 2019-03-06 15:50:53.804439274 +0100 +++ /work/SRC/openSUSE:Factory/.python3-ipa.new.28833/python3-ipa.changes 2019-03-18 10:42:55.543161967 +0100 @@ -1,0 +2,16 @@ +Fri Mar 15 13:46:22 UTC 2019 - Sean Marlow <[email protected]> + +- Update to v3.2.1 (2019-03-15) + + EC2 instances may have ipv6 addresses set to None. + +------------------------------------------------------------------- +Thu Mar 14 21:14:38 UTC 2019 - Sean Marlow <[email protected]> + +- Update to v3.2.0 (2019-03-14) + + Add repos for 15sp1. + + Use pytest fail instead of raise exception. + + Make ec2 network test more expressive. + + Add replacefiles option to zypper update. + + Use format string for motd check. + +------------------------------------------------------------------- Old: ---- python3-ipa-3.1.1.tar.gz New: ---- python3-ipa-3.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-ipa.spec ++++++ --- /var/tmp/diff_new_pack.Sa9OOC/_old 2019-03-18 10:42:56.191161598 +0100 +++ /var/tmp/diff_new_pack.Sa9OOC/_new 2019-03-18 10:42:56.195161595 +0100 @@ -18,7 +18,7 @@ %bcond_without test Name: python3-ipa -Version: 3.1.1 +Version: 3.2.1 Release: 0 Summary: Command line and API for testing custom images License: GPL-3.0-or-later ++++++ python3-ipa-3.1.1.tar.gz -> python3-ipa-3.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/CHANGES.md new/python3-ipa-3.2.1/CHANGES.md --- old/python3-ipa-3.1.1/CHANGES.md 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/CHANGES.md 2019-03-15 14:33:28.000000000 +0100 @@ -1,3 +1,23 @@ +v3.2.1 (2019-03-15) +=================== + +- EC2 instances may have ipv6 addresses set to None. + [\#183](https://github.com/SUSE-Enceladus/ipa/pull/183) + +v3.2.0 (2019-03-14) +=================== + +- Add repos for 15sp1. + [\#174](https://github.com/SUSE-Enceladus/ipa/pull/174) +- Use pytest fail instead of raise exception. + [\#175](https://github.com/SUSE-Enceladus/ipa/pull/175) +- Make ec2 network test more expressive. + [\#177](https://github.com/SUSE-Enceladus/ipa/pull/177) +- Add replacefiles option to zypper update. + [\#181](https://github.com/SUSE-Enceladus/ipa/pull/181) +- Use format string for motd check. + [\#182](https://github.com/SUSE-Enceladus/ipa/pull/182) + v3.1.1 (2019-02-28) =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/PKG-INFO new/python3-ipa-3.2.1/PKG-INFO --- old/python3-ipa-3.1.1/PKG-INFO 2019-02-28 17:33:03.000000000 +0100 +++ new/python3-ipa-3.2.1/PKG-INFO 2019-03-15 14:34:29.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: python3-ipa -Version: 3.1.1 +Version: 3.2.1 Summary: Package for automated testing of cloud images. Home-page: https://github.com/SUSE-Enceladus/ipa Author: SUSE @@ -150,6 +150,6 @@ Classifier: Programming Language :: Python :: 3.7 Requires-Python: >=3.4 Description-Content-Type: text/markdown +Provides-Extra: test Provides-Extra: dev Provides-Extra: tox -Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/ipa/__init__.py new/python3-ipa-3.2.1/ipa/__init__.py --- old/python3-ipa-3.1.1/ipa/__init__.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/ipa/__init__.py 2019-03-15 14:33:28.000000000 +0100 @@ -22,4 +22,4 @@ __author__ = """SUSE""" __email__ = '[email protected]' -__version__ = '3.1.1' +__version__ = '3.2.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/ipa/ipa_ec2.py new/python3-ipa-3.2.1/ipa/ipa_ec2.py --- old/python3-ipa-3.1.1/ipa/ipa_ec2.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/ipa/ipa_ec2.py 2019-03-15 14:33:28.000000000 +0100 @@ -300,7 +300,7 @@ # ipv6 try: ipv6 = instance.network_interfaces[0].ipv6_addresses[0] - except IndexError: + except (IndexError, TypeError): ipv6 = None self.instance_ip = instance.public_ip_address or \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/ipa/ipa_sles.py new/python3-ipa-3.2.1/ipa/ipa_sles.py --- old/python3-ipa-3.1.1/ipa/ipa_sles.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/ipa/ipa_sles.py 2019-03-15 14:33:28.000000000 +0100 @@ -52,4 +52,5 @@ def get_update_cmd(self): """Return command to update SLES instance.""" - return 'zypper -n up --auto-agree-with-licenses --force-resolution' + return 'zypper -n up --auto-agree-with-licenses ' \ + '--force-resolution --replacefiles' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/ipa/ipa_utils.py new/python3-ipa-3.2.1/ipa/ipa_utils.py --- old/python3-ipa-3.1.1/ipa/ipa_utils.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/ipa/ipa_utils.py 2019-03-15 14:33:28.000000000 +0100 @@ -106,9 +106,9 @@ try: stdin, stdout, stderr = client.exec_command(cmd) err = stderr.read() - if err: - raise IpaSSHException(err.decode()) out = stdout.read() + if err: + raise IpaSSHException(out.decode() + err.decode()) except: # noqa: E722 raise return out.decode() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/package/python3-ipa.spec new/python3-ipa-3.2.1/package/python3-ipa.spec --- old/python3-ipa-3.1.1/package/python3-ipa.spec 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/package/python3-ipa.spec 2019-03-15 14:33:28.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without test Name: python3-ipa -Version: 3.1.1 +Version: 3.2.1 Release: 0 Summary: Command line and API for testing custom images License: GPL-3.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/python3_ipa.egg-info/PKG-INFO new/python3-ipa-3.2.1/python3_ipa.egg-info/PKG-INFO --- old/python3-ipa-3.1.1/python3_ipa.egg-info/PKG-INFO 2019-02-28 17:33:03.000000000 +0100 +++ new/python3-ipa-3.2.1/python3_ipa.egg-info/PKG-INFO 2019-03-15 14:34:29.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: python3-ipa -Version: 3.1.1 +Version: 3.2.1 Summary: Package for automated testing of cloud images. Home-page: https://github.com/SUSE-Enceladus/ipa Author: SUSE @@ -150,6 +150,6 @@ Classifier: Programming Language :: Python :: 3.7 Requires-Python: >=3.4 Description-Content-Type: text/markdown +Provides-Extra: test Provides-Extra: dev Provides-Extra: tox -Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/setup.cfg new/python3-ipa-3.2.1/setup.cfg --- old/python3-ipa-3.1.1/setup.cfg 2019-02-28 17:33:03.000000000 +0100 +++ new/python3-ipa-3.2.1/setup.cfg 2019-03-15 14:34:29.000000000 +0100 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.1.1 +current_version = 3.2.1 commit = True tag = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/setup.py new/python3-ipa-3.2.1/setup.py --- old/python3-ipa-3.1.1/setup.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/setup.py 2019-03-15 14:33:28.000000000 +0100 @@ -43,7 +43,7 @@ setup( name='python3-ipa', - version='3.1.1', + version='3.2.1', description="Package for automated testing of cloud images.", long_description=readme, long_description_content_type="text/markdown", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/tests/test_ipa_sles_distro.py new/python3-ipa-3.2.1/tests/test_ipa_sles_distro.py --- old/python3-ipa-3.1.1/tests/test_ipa_sles_distro.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/tests/test_ipa_sles_distro.py 2019-03-15 14:33:28.000000000 +0100 @@ -109,7 +109,7 @@ mocked.assert_called_once_with( client, "sudo sh -c 'zypper -n refresh;zypper -n up " - "--auto-agree-with-licenses --force-resolution'" + "--auto-agree-with-licenses --force-resolution --replacefiles'" ) assert output == 'Update finished!' @@ -130,5 +130,5 @@ mocked.assert_called_once_with( client, "sudo sh -c 'zypper -n refresh;zypper -n up " - "--auto-agree-with-licenses --force-resolution'" + "--auto-agree-with-licenses --force-resolution --replacefiles'" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/tests/test_ipa_utils.py new/python3-ipa-3.2.1/tests/test_ipa_utils.py --- old/python3-ipa-3.1.1/tests/test_ipa_utils.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/tests/test_ipa_utils.py 2019-03-15 14:33:28.000000000 +0100 @@ -117,18 +117,22 @@ def test_utils_ssh_exec_command_exception(): """Test error in ssh exec command raises exception.""" - stdin = stdout = MagicMock() + stdin = MagicMock() stderr = MagicMock() stderr.read.return_value = b'Exception: ls is not allowed!' + stdout = MagicMock() + stdout.read.return_value = b'Other information\n' + client = MagicMock() client.exec_command.return_value = (stdin, stdout, stderr) with pytest.raises(IpaSSHException) as error: ipa_utils.execute_ssh_command(client, 'ls') - assert str(error.value) == 'Exception: ls is not allowed!' + msg = 'Other information\nException: ls is not allowed!' + assert str(error.value) == msg def test_utils_expand_test_files(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py 2019-03-15 14:33:28.000000000 +0100 @@ -52,11 +52,14 @@ dl_result = host.run( 'curl -o /dev/null --max-time {0} --silent ' - '--write-out "%{{size_download}}" {1}'.format( + '--write-out "%{{size_download}}|%{{http_code}}" {1}'.format( types[instance_type], url ) ) - size = dl_result.stdout.strip() - if size != '1214599168': - raise Exception('Download failed!') + size, code = dl_result.stdout.strip().split('|') + + if code != '200': + pytest.fail('Image ISO not found for region: {0}'.format(region)) + elif size != '1214599168': + pytest.fail('Download failed. Size: {0}'.format(str(size))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/conftest.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/conftest.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/conftest.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/conftest.py 2019-03-15 14:33:28.000000000 +0100 @@ -189,14 +189,6 @@ ] SLE_15_MODULES = [ - 'SLE-Module-CAP-Tools15-Debuginfo-Pool', - 'SLE-Module-CAP-Tools15-Debuginfo-Updates', - 'SLE-Module-CAP-Tools15-Pool', - 'SLE-Module-CAP-Tools15-Updates', - 'SLE-Module-Containers15-Debuginfo-Pool', - 'SLE-Module-Containers15-Debuginfo-Updates', - 'SLE-Module-Containers15-Pool', - 'SLE-Module-Containers15-Updates', 'SLE-Module-Desktop-Applications15-Debuginfo-Pool', 'SLE-Module-Desktop-Applications15-Debuginfo-Updates', 'SLE-Module-Desktop-Applications15-Pool', @@ -223,6 +215,17 @@ 'SLE-Module-Web-Scripting15-Updates' ] +SLE_15_X86_64_MODULES = [ + 'SLE-Module-CAP-Tools15-Debuginfo-Pool', + 'SLE-Module-CAP-Tools15-Debuginfo-Updates', + 'SLE-Module-CAP-Tools15-Pool', + 'SLE-Module-CAP-Tools15-Updates', + 'SLE-Module-Containers15-Debuginfo-Pool', + 'SLE-Module-Containers15-Debuginfo-Updates', + 'SLE-Module-Containers15-Pool', + 'SLE-Module-Containers15-Updates' +] + SLE_15_SAP = [ 'SLE-Module-SAP-Applications15-Debuginfo-Pool', 'SLE-Module-SAP-Applications15-Debuginfo-Updates', @@ -238,27 +241,109 @@ 'SLE-Product-SLES_SAP15-Updates' ] +SLE_15_SP1_BASE = [ + 'SLE-Module-Basesystem15-SP1-Debuginfo-Pool', + 'SLE-Module-Basesystem15-SP1-Debuginfo-Updates', + 'SLE-Module-Basesystem15-SP1-Pool', + 'SLE-Module-Basesystem15-SP1-Updates' +] + +SLE_15_SP1_PRODUCTS = [ + 'SLE-Product-SLES15-SP1-Pool', + 'SLE-Product-SLES15-SP1-Updates' +] + +SLE_15_SP1_MODULES = [ + 'SLE-Module-Desktop-Applications15-SP1-Debuginfo-Pool', + 'SLE-Module-Desktop-Applications15-SP1-Debuginfo-Updates', + 'SLE-Module-Desktop-Applications15-SP1-Pool', + 'SLE-Module-Desktop-Applications15-SP1-Updates', + 'SLE-Module-DevTools15-SP1-Debuginfo-Pool', + 'SLE-Module-DevTools15-SP1-Debuginfo-Updates', + 'SLE-Module-DevTools15-SP1-Pool', + 'SLE-Module-DevTools15-SP1-Updates', + 'SLE-Module-Legacy15-SP1-Debuginfo-Pool', + 'SLE-Module-Legacy15-SP1-Debuginfo-Updates', + 'SLE-Module-Legacy15-SP1-Pool', + 'SLE-Module-Legacy15-SP1-Updates', + 'SLE-Module-Public-Cloud15-SP1-Debuginfo-Pool', + 'SLE-Module-Public-Cloud15-SP1-Debuginfo-Updates', + 'SLE-Module-Public-Cloud15-SP1-Pool', + 'SLE-Module-Public-Cloud15-SP1-Updates', + 'SLE-Module-Python2-15-SP1-Pool', + 'SLE-Module-Python2-15-SP1-Updates', + 'SLE-Module-Server-Applications15-SP1-Debuginfo-Pool', + 'SLE-Module-Server-Applications15-SP1-Debuginfo-Updates', + 'SLE-Module-Server-Applications15-SP1-Pool', + 'SLE-Module-Server-Applications15-SP1-Updates', + 'SLE-Module-Web-Scripting15-SP1-Debuginfo-Pool', + 'SLE-Module-Web-Scripting15-SP1-Debuginfo-Updates', + 'SLE-Module-Web-Scripting15-SP1-Pool', + 'SLE-Module-Web-Scripting15-SP1-Updates' +] + +SLE_15_SP1_X86_64_MODULES = [ + 'SLE-Module-CAP-Tools15-SP1-Debuginfo-Pool', + 'SLE-Module-CAP-Tools15-SP1-Debuginfo-Updates', + 'SLE-Module-CAP-Tools15-SP1-Pool', + 'SLE-Module-CAP-Tools15-SP1-Updates', + 'SLE-Module-Containers15-SP1-Debuginfo-Pool', + 'SLE-Module-Containers15-SP1-Debuginfo-Updates', + 'SLE-Module-Containers15-SP1-Pool', + 'SLE-Module-Containers15-SP1-Updates' +] + +SLE_15_SP1_SAP = [ + 'SLE-Module-SAP-Applications15-SP1-Debuginfo-Pool', + 'SLE-Module-SAP-Applications15-SP1-Debuginfo-Updates', + 'SLE-Module-SAP-Applications15-SP1-Pool', + 'SLE-Module-SAP-Applications15-SP1-Updates', + 'SLE-Product-HA15-SP1-Debuginfo-Pool', + 'SLE-Product-HA15-SP1-Debuginfo-Updates', + 'SLE-Product-HA15-SP1-Pool', + 'SLE-Product-HA15-SP1-Updates', + 'SLE-Product-SLES_SAP15-SP1-Debuginfo-Pool', + 'SLE-Product-SLES_SAP15-SP1-Debuginfo-Updates', + 'SLE-Product-SLES_SAP15-SP1-Pool', + 'SLE-Product-SLES_SAP15-SP1-Updates' +] + +BASE_15 = SLE_15_BASE + SLE_15_MODULES + SLE_15_PRODUCTS +BASE_15_SAP = SLE_15_SAP + SLE_15_BASE + SLE_15_MODULES +BASE_15_SP1 = SLE_15_SP1_BASE + SLE_15_SP1_MODULES + SLE_15_SP1_PRODUCTS +BASE_15_SP1_SAP = SLE_15_SP1_SAP + SLE_15_SP1_BASE + SLE_15_SP1_MODULES + SLES_REPOS = { - '11.4': SLE_11_SP4_BASE + SLE_11_SP4_MODULES, - '12': SLE_12_BASE + SLE_12_MODULES, - '12-SAP': SLE_12_SAP + SLE_12_BASE + SLE_12_MODULES, - '12-SP1': SLE_12_SP1_BASE + SLE_12_SP1_MODULES, - '12-SP1-SAP': SLE_12_SP1_SAP + SLE_12_SP1_BASE + SLE_12_SP1_MODULES, - '12-SP2': SLE_12_SP2_BASE + SLE_12_SP2_MODULES, - '12-SP2-SAP': SLE_12_SP2_SAP + SLE_12_SP2_BASE + SLE_12_SP2_MODULES, - '12-SP3': SLE_12_SP3_BASE + SLE_12_SP3_MODULES, - '12-SP3-SAP': SLE_12_SP3_SAP + SLE_12_SP3_BASE + SLE_12_SP3_MODULES, - '12-SP4': SLE_12_SP4_BASE + SLE_12_SP4_MODULES, - '12-SP4-SAP': SLE_12_SP4_SAP + SLE_12_SP4_BASE + SLE_12_SP4_MODULES, - '15': SLE_15_BASE + SLE_15_MODULES + SLE_15_PRODUCTS, - '15-SAP': SLE_15_SAP + SLE_15_BASE + SLE_15_MODULES + '11.4-X86_64': SLE_11_SP4_BASE + SLE_11_SP4_MODULES, + '12-X86_64': SLE_12_BASE + SLE_12_MODULES, + '12-X86_64-SAP': SLE_12_SAP + SLE_12_BASE + SLE_12_MODULES, + '12-SP1-X86_64': SLE_12_SP1_BASE + SLE_12_SP1_MODULES, + '12-SP1-X86_64-SAP': + SLE_12_SP1_SAP + SLE_12_SP1_BASE + SLE_12_SP1_MODULES, + '12-SP2-X86_64': SLE_12_SP2_BASE + SLE_12_SP2_MODULES, + '12-SP2-X86_64-SAP': + SLE_12_SP2_SAP + SLE_12_SP2_BASE + SLE_12_SP2_MODULES, + '12-SP3-X86_64': SLE_12_SP3_BASE + SLE_12_SP3_MODULES, + '12-SP3-X86_64-SAP': + SLE_12_SP3_SAP + SLE_12_SP3_BASE + SLE_12_SP3_MODULES, + '12-SP4-X86_64': SLE_12_SP4_BASE + SLE_12_SP4_MODULES, + '12-SP4-X86_64-SAP': + SLE_12_SP4_SAP + SLE_12_SP4_BASE + SLE_12_SP4_MODULES, + '15-AARCH64': BASE_15, + '15-AARCH64-SAP': BASE_15_SAP, + '15-X86_64': BASE_15 + SLE_15_X86_64_MODULES, + '15-X86_64-SAP': BASE_15_SAP + SLE_15_X86_64_MODULES, + '15-SP1-AARCH64': BASE_15_SP1, + '15-SP1-AARCH64-SAP': BASE_15_SP1_SAP, + '15-SP1-X86_64': BASE_15_SP1 + SLE_15_SP1_X86_64_MODULES, + '15-SP1-X86_64-SAP': BASE_15_SP1_SAP + SLE_15_SP1_X86_64_MODULES, } @pytest.fixture() def get_sles_repos(): def f(version): - return SLES_REPOS[version] + return SLES_REPOS.get(version) return f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_motd.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_motd.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_motd.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_motd.py 2019-03-15 14:33:28.000000000 +0100 @@ -1,5 +1,9 @@ def test_sles_motd(host, get_release_value): motd = host.file('/etc/motd') - pretty_name = get_release_value('PRETTY_NAME') - assert pretty_name - assert motd.contains(pretty_name) + version = get_release_value('VERSION') + assert version + assert motd.contains( + 'SUSE Linux Enterprise Server {0}'.format( + version.replace('-', ' ') + ) + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_repos.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_repos.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_repos.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_repos.py 2019-03-15 14:33:28.000000000 +0100 @@ -1,19 +1,32 @@ +import pytest def test_sles_repos(check_zypper_repo, determine_provider, get_release_value, get_sles_repos, - is_sles_sap): + is_sles_sap, + determine_architecture): + version = [] provider = determine_provider() - version = get_release_value('VERSION') + version.append(get_release_value('VERSION')) + version.append(determine_architecture()) sap = is_sles_sap() if sap: - version += '-SAP' + version.append('SAP') + + version = '-'.join(version) missing_repos = [] - for repo in get_sles_repos(version): + repos = get_sles_repos(version) + + if not repos: + pytest.fail( + 'No repos found for version {0}'.format(version) + ) + + for repo in repos: result = check_zypper_repo( ''.join([ 'SMT-http_smt-{provider}_susecloud_net:'.format( @@ -33,6 +46,6 @@ ) if missing_repos: - raise Exception( + pytest.fail( 'Missing Repos: \n{0}'.format('\n'.join(missing_repos)) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_wait_on_registration.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_wait_on_registration.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/SLES/test_sles_wait_on_registration.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/SLES/test_sles_wait_on_registration.py 2019-03-15 14:33:28.000000000 +0100 @@ -1,3 +1,4 @@ +import pytest import time @@ -13,6 +14,6 @@ else: time.sleep(10) else: - raise Exception( + pytest.fail( 'Registration did not finish properly for on-demand instance.' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/conftest.py new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/conftest.py --- old/python3-ipa-3.1.1/usr/share/lib/ipa/tests/conftest.py 2019-02-28 17:32:05.000000000 +0100 +++ new/python3-ipa-3.2.1/usr/share/lib/ipa/tests/conftest.py 2019-03-15 14:33:28.000000000 +0100 @@ -109,6 +109,14 @@ @pytest.fixture() +def determine_architecture(host): + def f(): + result = host.run('uname --m') + return result.stdout.strip().upper() + return f + + [email protected]() def determine_provider(host): def f(): result = host.run('sudo dmidecode -t system')
