Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F12297575
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/_tests/modules/test_forest.py b/_tests/modules/test_forest.py
index 274e085..99b2329 100644
--- a/_tests/modules/test_forest.py
+++ b/_tests/modules/test_forest.py
@@ -1,53 +1,53 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-forest = imp.load_source('forest', "../_modules/forest.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+forest = SourceFileLoader('forest', "../_modules/forest.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
def setUp(self):
self.initialize_mocks()
self.instance = forest
self.mock_pillar('data/forests.yaml')
self.mock_grains()
self.grains['id'] = 'egladil'
def test_exists(self):
self.assertTrue(forest.exists('lothlorien'))
self.assertFalse(forest.exists('notexisting'))
def test_get(self):
self.assertEqual("lothlorien", forest.get())
def test_get_when_key_not_exists(self):
self.grains['id'] = 'notexisting'
self.assertRaises(KeyError, forest.get)
def test_list_groups(self):
self.assertEqual(['caras_galadhon', 'ubiquity'],
sorted(forest.list_groups()))
def test_list_groups_when_there_are_none_for_the_foreest(self):
self.grains['id'] = 'entwash'
self.assertEqual(['ubiquity'], forest.list_groups())
def test_get_groups(self):
self.assertEqual(['caras_galadhon', 'ubiquity'],
sorted(forest.get_groups().keys()))
def test_list_users(self):
self.assertEqual(['amdir', 'amroth'],
sorted(forest.list_users()))
def test_get_users(self):
self.assertEqual(['amdir', 'amroth'],
sorted(forest.get_users().keys()))
if __name__ == '__main__':
unittest.main()
diff --git a/_tests/modules/test_jails.py b/_tests/modules/test_jails.py
index 7d7bcdb..cae60f3 100644
--- a/_tests/modules/test_jails.py
+++ b/_tests/modules/test_jails.py
@@ -1,43 +1,43 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-jails = imp.load_source('jails', "../_modules/jails.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+jails = SourceFileLoader('jails', "../_modules/jails.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
def setUp(self):
self.initialize_mocks()
self.instance = jails
self.mock_pillar('data/jails.yaml')
self.mock_grains()
self.grains['id'] = 'host'
def test_get_default_group(self):
self.assertEqual('host', jails._get_default_group())
def test_get_all_jails(self):
self.assertEqual(['anotherhost', 'host'],
sorted(jails._get_all_jails().keys()))
def test_list(self):
self.assertEqual(['guest1', 'guest2'],
sorted(jails.list()))
def test_list_for_a_group(self):
self.assertEqual(['guest3'],
sorted(jails.list('anotherhost')))
def test_flatlist(self):
self.assertEqual("guest1 guest2", jails.flatlist())
def test_flatlist_for_a_group(self):
self.assertEqual("guest3", jails.flatlist('anotherhost'))
if __name__ == '__main__':
unittest.main()
diff --git a/_tests/modules/test_node.py b/_tests/modules/test_node.py
index 6bfa2d8..fdd5b9d 100644
--- a/_tests/modules/test_node.py
+++ b/_tests/modules/test_node.py
@@ -1,115 +1,115 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-node = imp.load_source('node', "../_modules/node.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+node = SourceFileLoader('node', "../_modules/node.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
def setUp(self):
self.initialize_mocks()
self.instance = node
self.mock_pillar('data/forests.yaml')
self.mock_grains()
self.grains['id'] = 'egladil'
def test_get_wwwroot(self):
self.assertEqual("wwwroot/lothlorien.forest/egladil",
node.get_wwwroot())
self.assertEqual("wwwroot/entwash.node/www",
node.get_wwwroot('entwash'))
def test_has_web_content(self):
self.assertTrue(node.has_web_content('.ll/carasgaladhon'))
self.assertFalse(node.has_web_content('.arda/onodlo'))
self.assertTrue(node.has_web_content('.arda/onodlo', 'entwash'))
self.assertFalse(node.has_web_content('notexisting'))
def test_filter_by_role(self):
node_key = self.grains['id']
self.assertEqual(['Caras Galadhon'],
node.filter_by_role('items_by_role'))
self.assertEqual(['Onodlo'],
node.filter_by_role('items_by_role', 'entwash'))
# No role
self.pillar['nodes'][node_key]['roles'] = []
self.assertEqual([],
node.filter_by_role('items_by_role'))
# More than one role
self.pillar['nodes'][node_key]['roles'] = [
'border',
'treecity'
]
self.assertEqual(['Caras Galadhon', 'Onodlo'],
sorted(node.filter_by_role('items_by_role')))
def test_filter_by_role_with_star(self):
node_key = self.grains['id']
self.assertEqual(['Air', 'Caras Galadhon'],
node.filter_by_role('items_by_role_with_star'))
self.assertEqual(['Air', 'Onodlo'],
node.filter_by_role(
'items_by_role_with_star',
'entwash'
))
# No role
self.pillar['nodes'][node_key]['roles'] = []
self.assertEqual(['Air'],
node.filter_by_role('items_by_role_with_star'))
# More than one role
self.pillar['nodes'][node_key]['roles'] = [
'border',
'treecity'
]
self.assertEqual(
['Air', 'Caras Galadhon', 'Onodlo'],
sorted(node.filter_by_role('items_by_role_with_star'))
)
def test_filter_by_name(self):
self.assertEqual(
['Caras Galadhon'],
node.filter_by_name('items_by_name')
)
self.assertEqual(
['Caras Galadhon'],
node.filter_by_name('items_by_name', 'egladil')
)
self.grains['id'] = 'entwash'
self.assertEqual(
[],
node.filter_by_name('items_by_name')
)
def test_filter_by_name_with_star(self):
self.assertEqual(
['Air', 'Caras Galadhon'],
node.filter_by_name('items_by_name_with_star')
)
self.assertEqual(
['Air', 'Caras Galadhon'],
node.filter_by_name('items_by_name_with_star', 'egladil')
)
self.grains['id'] = 'entwash'
self.assertEqual(
['Air'],
node.filter_by_name('items_by_name_with_star')
)
diff --git a/_tests/salt_test_case.py b/_tests/salt_test_case.py
index c8dd642..baae1c3 100644
--- a/_tests/salt_test_case.py
+++ b/_tests/salt_test_case.py
@@ -1,29 +1,29 @@
-import imp
+from importlib.machinery import SourceFileLoader
import yaml
class SaltTestCase:
def initialize_mocks(self):
- source = imp.load_source('dunder', "mocks/dunder.py")
+ source = SourceFileLoader("dunder", "mocks/dunder.py").load_module()
self.pillar = source.dunder()
self.grains = source.dunder()
def import_data_from_yaml(self, filename):
with open(filename, 'r') as fd:
return yaml.load(fd.read())
def mock_pillar(self, filename=None, target=None):
if not target:
target = self.instance
if filename:
self.pillar.data = self.import_data_from_yaml(filename)
target.__pillar__ = self.pillar
def mock_grains(self, target=None):
if not target:
target = self.instance
target.__grains__ = self.grains
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Wed, Oct 22, 12:25 (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3092127
Default Alt Text
(8 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment