updated tests

slapos/tests/entry.py

@@ -28,7 +28,7 @@
 
 import os
 import shutil
-import slapos.entry as entry
+from slapos.cli_legacy import entry
 import sys
 import tempfile
 import unittest

slapos/tests/slapformat.py

@@ -243,7 +243,9 @@ class TestComputer(SlapformatMixin):
   @unittest.skip("Not implemented")
   def test_construct_empty_prepared(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     computer.construct()
@@ -262,7 +264,9 @@ class TestComputer(SlapformatMixin):
 
   def test_construct_empty_prepared_no_alter_user(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     computer.construct(alter_user=False)
@@ -278,7 +282,9 @@ class TestComputer(SlapformatMixin):
   @unittest.skip("Not implemented")
   def test_construct_empty_prepared_no_alter_network(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     computer.construct(alter_network=False)
@@ -297,7 +303,9 @@ class TestComputer(SlapformatMixin):
 
   def test_construct_empty_prepared_no_alter_network_user(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     computer.construct(alter_network=False, alter_user=False)
@@ -314,7 +322,9 @@ class TestComputer(SlapformatMixin):
   @unittest.skip("Not implemented")
   def test_construct_prepared(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     partition = slapos.format.Partition('partition', '/part_path',
@@ -358,7 +368,9 @@ class TestComputer(SlapformatMixin):
 
   def test_construct_prepared_no_alter_user(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     partition = slapos.format.Partition('partition', '/part_path',
@@ -399,7 +411,9 @@ class TestComputer(SlapformatMixin):
   @unittest.skip("Not implemented")
   def test_construct_prepared_no_alter_network(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     partition = slapos.format.Partition('partition', '/part_path',
@@ -439,7 +453,9 @@ class TestComputer(SlapformatMixin):
 
   def test_construct_prepared_no_alter_network_user(self):
     computer = slapos.format.Computer('computer',
-      interface=slapos.format.Interface('bridge', '127.0.0.1/16'))
+      interface=slapos.format.Interface(logger=self.test_result,
+                                        name='bridge',
+                                        ipv4_local_network='127.0.0.1/16'))
     computer.instance_root = '/instance_root'
     computer.software_root = '/software_root'
     partition = slapos.format.Partition('partition', '/part_path',

slapos/tests/slapgrid.py

@@ -44,6 +44,8 @@ import unittest
 import urlparse
 import xml_marshaller
 
+dummylogger = logging.getLogger()
+
 
 WATCHDOG_TEMPLATE = """#!%(python_path)s -S