diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-07-30 10:03:35 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-07-30 10:06:19 -0400 |
| commit | e63a254f473f31baec39394776d71d3318581d94 (patch) | |
| tree | c2c57d0f54fe6d59d7b9c4db6cfef09a0a5e1134 /utils/test | |
| parent | 2c9705255d5c414a1679b8663333c2ace2a418cc (diff) | |
| download | openshift-e63a254f473f31baec39394776d71d3318581d94.tar.gz openshift-e63a254f473f31baec39394776d71d3318581d94.tar.bz2 openshift-e63a254f473f31baec39394776d71d3318581d94.tar.xz openshift-e63a254f473f31baec39394776d71d3318581d94.zip | |
a-o-i: Remove AEP, OSE 3.0, and OSE 3.2 choices
Remove the option to select unsupported versions in the quick installer.
Fixes BZ#1358101
Diffstat (limited to 'utils/test')
| -rw-r--r-- | utils/test/cli_installer_tests.py | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py index d79163e91..3044a2449 100644 --- a/utils/test/cli_installer_tests.py +++ b/utils/test/cli_installer_tests.py @@ -573,7 +573,7 @@ class UnattendedCliTests(OOCliFixture): run_playbook_mock.return_value = 0 config = SAMPLE_CONFIG % 'openshift-enterprise' - config = '%s\n%s' % (config, 'variant_version: 3.0') + config = '%s\n%s' % (config, 'variant_version: 3.2') config_file = self.write_config(os.path.join(self.work_dir, 'ooinstall.conf'), config) @@ -586,11 +586,11 @@ class UnattendedCliTests(OOCliFixture): self.assertEquals('openshift-enterprise', written_config['variant']) # Make sure our older version was preserved: # and written to disk: - self.assertEquals('3.0', written_config['variant_version']) + self.assertEquals('3.2', written_config['variant_version']) inventory = ConfigParser.ConfigParser(allow_no_value=True) inventory.read(os.path.join(self.work_dir, 'hosts')) - self.assertEquals('enterprise', + self.assertEquals('openshift-enterprise', inventory.get('OSEv3:vars', 'deployment_type')) @patch('ooinstall.openshift_ansible.run_ansible') @@ -1068,26 +1068,6 @@ class AttendedCliTests(OOCliFixture): self.assert_inventory_host_var(inventory, 'nodes', '10.0.0.1', 'openshift_schedulable=True') - #interactive 3.0 install confirm no HA hints - @patch('ooinstall.openshift_ansible.run_main_playbook') - @patch('ooinstall.openshift_ansible.load_system_facts') - def test_ha_hint(self, load_facts_mock, run_playbook_mock): - load_facts_mock.return_value = (MOCK_FACTS, 0) - run_playbook_mock.return_value = 0 - - cli_input = build_input(hosts=[ - ('10.0.0.1', True, False)], - ssh_user='root', - variant_num=3, - confirm_facts='y', - storage='10.1.0.1',) - self.cli_args.append("install") - result = self.runner.invoke(cli.cli, self.cli_args, - input=cli_input) - self.assert_result(result, 0) - print result.output - self.assertTrue("NOTE: Add a total of 3 or more Masters to perform an HA installation." - not in result.output) @patch('ooinstall.openshift_ansible.run_main_playbook') @patch('ooinstall.openshift_ansible.load_system_facts') |