summaryrefslogtreecommitdiffstats
path: root/tests/pyanaconda_test
diff options
context:
space:
mode:
authorVratislav Podzimek <vpodzime@redhat.com>2012-11-29 14:21:05 +0100
committerVratislav Podzimek <vpodzime@redhat.com>2012-12-03 17:06:57 +0100
commit158dacfd861adf8ad6c72ee6cc88caf924db9139 (patch)
tree962a678a07966ec89950e7c0a04b5bc2ec119c88 /tests/pyanaconda_test
parentcc8c9963a4f5872ce9e2f718284dcca9525e90e6 (diff)
downloadanaconda-158dacfd861adf8ad6c72ee6cc88caf924db9139.tar.gz
anaconda-158dacfd861adf8ad6c72ee6cc88caf924db9139.tar.xz
anaconda-158dacfd861adf8ad6c72ee6cc88caf924db9139.zip
Improve and document network.sanityCheckHostname
The rules for hostname are more strict. Also, it was not easy to use this function because of its return values. Related: rhbz#865869
Diffstat (limited to 'tests/pyanaconda_test')
-rw-r--r--tests/pyanaconda_test/network_test.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/pyanaconda_test/network_test.py b/tests/pyanaconda_test/network_test.py
index 734878cd1..a5afbe685 100644
--- a/tests/pyanaconda_test/network_test.py
+++ b/tests/pyanaconda_test/network_test.py
@@ -47,28 +47,28 @@ class NetworkTest(mock.TestCase):
def sanity_check_hostname_1_test(self):
import pyanaconda.network
- ret = pyanaconda.network.sanityCheckHostname('desktop')
- self.assertEqual(ret, None)
+ (valid, err) = pyanaconda.network.sanityCheckHostname('desktop')
+ self.assertTrue(valid)
def sanity_check_hostname_2_test(self):
import pyanaconda.network
- ret = pyanaconda.network.sanityCheckHostname('')
- self.assertEqual(ret, None)
+ (valid, err) = pyanaconda.network.sanityCheckHostname('')
+ self.assertFalse(valid)
def sanity_check_hostname_3_test(self):
import pyanaconda.network
- ret = pyanaconda.network.sanityCheckHostname('c'*256)
- self.assertNotEqual(ret, None)
+ (valid, err) = pyanaconda.network.sanityCheckHostname('c'*256)
+ self.assertFalse(valid)
def sanity_check_hostname_4_test(self):
import pyanaconda.network
- ret = pyanaconda.network.sanityCheckHostname('_asf')
- self.assertNotEqual(ret, None)
+ (valid, err) = pyanaconda.network.sanityCheckHostname('_asf')
+ self.assertFalse(valid)
def sanity_check_hostname_5_test(self):
import pyanaconda.network
- ret = pyanaconda.network.sanityCheckHostname('a?f')
- self.assertNotEqual(ret, None)
+ (valid, err) = pyanaconda.network.sanityCheckHostname('a?f')
+ self.assertFalse(valid)
def get_default_hostname_1_test(self):
import pyanaconda.network