diff options
Diffstat (limited to 'tests/pyanaconda_test')
-rw-r--r-- | tests/pyanaconda_test/backend_test.py | 8 | ||||
-rw-r--r-- | tests/pyanaconda_test/firewall_test.py | 10 | ||||
-rw-r--r-- | tests/pyanaconda_test/language_test.py | 10 | ||||
-rw-r--r-- | tests/pyanaconda_test/security_test.py | 25 | ||||
-rw-r--r-- | tests/pyanaconda_test/timezone_test.py | 13 | ||||
-rw-r--r-- | tests/pyanaconda_test/users_test.py | 13 |
6 files changed, 0 insertions, 79 deletions
diff --git a/tests/pyanaconda_test/backend_test.py b/tests/pyanaconda_test/backend_test.py index 2799d1078..2dd278eef 100644 --- a/tests/pyanaconda_test/backend_test.py +++ b/tests/pyanaconda_test/backend_test.py @@ -158,14 +158,6 @@ class BackendTest(mock.TestCase): ab.getDefaultGroups(anaconda) self.assertTrue(self.logger.warning.called) - def anaconda_backend_write_packages_ks_test(self): - import pyanaconda.backend - FILE = '' - anaconda = mock.Mock() - ab = pyanaconda.backend.AnacondaBackend(anaconda) - ab.writePackagesKS(FILE, anaconda) - self.assertTrue(self.logger.warning.called) - def anaconda_backend_write_configuration_test(self): import pyanaconda.backend anaconda = mock.Mock() diff --git a/tests/pyanaconda_test/firewall_test.py b/tests/pyanaconda_test/firewall_test.py index 08ada87ee..19c455479 100644 --- a/tests/pyanaconda_test/firewall_test.py +++ b/tests/pyanaconda_test/firewall_test.py @@ -39,13 +39,3 @@ class FirewallTest(mock.TestCase): } ) ]) - - def default_ks_test(self): - """Simulate writing default fw to kickstart""" - - import pyanaconda.firewall - fw = pyanaconda.firewall.Firewall() - f = self.fs.open("/tmp/fw.txt", "w") - fw.writeKS(f) - f.close() - self.assertEquals(self.fs["/tmp/fw.txt"], "firewall --service=ssh\n") diff --git a/tests/pyanaconda_test/language_test.py b/tests/pyanaconda_test/language_test.py index 09e9ce60f..5c895b298 100644 --- a/tests/pyanaconda_test/language_test.py +++ b/tests/pyanaconda_test/language_test.py @@ -255,13 +255,3 @@ class LanguageTest(mock.TestCase): ret = lang.write() self.assertEqual(self.fs['/mnt/sysimage/etc/sysconfig/i18n'], 'LANG="cs_CZ.UTF-8"\nSYSFONT="latarcyrheb-sun16"\n') - - def write_ks_test(self): - import pyanaconda.language - lang = pyanaconda.language.Language() - lang.systemLang = 'cs' - f = self.fs.open('/tmp/lang', 'w') - lang.writeKS(f) - f.close() - self.assertEqual(self.fs['/tmp/lang'], 'lang cs_CZ.UTF-8\n') - diff --git a/tests/pyanaconda_test/security_test.py b/tests/pyanaconda_test/security_test.py index 1a5b5de90..33b94c18c 100644 --- a/tests/pyanaconda_test/security_test.py +++ b/tests/pyanaconda_test/security_test.py @@ -38,31 +38,6 @@ class SecurityTest(mock.TestCase): scrt.setSELinux('bad_state') self.assertTrue(scrt.getSELinux() in states) - def write_ks_1_test(self): - """Simulate writing security to kickstart (1)""" - import pyanaconda.security - - scrt = pyanaconda.security.Security() - f = self.fs.open('/tmp/security_ks1', 'w') - scrt.writeKS(f) - f.close() - - self.assertEqual(self.fs['/tmp/security_ks1'], - 'selinux --enforcing\nauthconfig --enableshadow --passalgo=sha512\n') - - def write_ks_2_test(self): - """Simulate writing security to kickstart (2)""" - import pyanaconda.security - - scrt = pyanaconda.security.Security() - scrt.selinux = pyanaconda.security.SELINUX_DISABLED - f = self.fs.open('/tmp/security_ks2', 'w') - scrt.writeKS(f) - f.close() - - self.assertEqual(self.fs['/tmp/security_ks2'], - 'selinux --disabled\nauthconfig --enableshadow --passalgo=sha512\n') - def write_test(self): """Simulate writing security (simulate executing lokkit and authconfig)""" import pyanaconda.security diff --git a/tests/pyanaconda_test/timezone_test.py b/tests/pyanaconda_test/timezone_test.py index 5801947b4..499989f86 100644 --- a/tests/pyanaconda_test/timezone_test.py +++ b/tests/pyanaconda_test/timezone_test.py @@ -37,19 +37,6 @@ class TimeZoneTest(mock.TestCase): tz.setTimezoneInfo(ZONE, UTC) self.assertEqual((ZONE, UTC), (tz.tz, tz.utc)) - def write_ks_test(self): - import pyanaconda.timezone - tz = pyanaconda.timezone.Timezone() - tz.tz = ZONE - tz.utc = UTC - - f = self.fs.open('/test_file', 'w') - tz.writeKS(f) - f.close() - - example = 'timezone --utc %s\n' % (ZONE) - self.assertEqual(self.fs['/test_file'], example) - def write_test(self): import pyanaconda.timezone diff --git a/tests/pyanaconda_test/users_test.py b/tests/pyanaconda_test/users_test.py index c7246ea29..c457ef762 100644 --- a/tests/pyanaconda_test/users_test.py +++ b/tests/pyanaconda_test/users_test.py @@ -140,16 +140,3 @@ class UsersTest(mock.TestCase): methods = [x[0] for x in pyanaconda.users.libuser.admin().method_calls] self.assertEqual(methods, ['lookupUserByName', 'setpassUser', 'modifyUser']) - - def writeks_test(self): - import pyanaconda.users - usr = pyanaconda.users.Users(self.anaconda) - - f = self.fs.open('/test_file', 'w') - usr.writeKS(f) - f.close() - - import re - self.assertTrue( - re.match(r"rootpw[ ]+--iscrypted[ ]+.*\n", self.fs['/test_file'])) - |