finishing up tests

Author: allmightyspiff

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -769,4 +769,4 @@
 ]
 
 migrate = True
-migrateDedicatedHost = True
+migrateDedicatedHost = True

SoftLayer/testing/__init__.py

@@ -151,7 +151,6 @@ def assert_not_called_with(self, service, method, **props):
         if self.calls(service, method, **props):
             raise AssertionError('%s::%s was called with given properties: %s' % (service, method, props))
 
-
     def assert_no_fail(self, result):
         """Fail when a failing click result has an error"""
         if result.exception:

tests/CLI/modules/vs/vs_tests.py

@@ -823,9 +823,18 @@ def test_vs_migrate_list(self):
         self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrate')
         self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrateDedicatedHost')
 
+    def test_vs_migrate_list_empty(self):
+        mock = self.set_mock('SoftLayer_Account', 'getVirtualGuests')
+        mock.return_value = []
+        result = self.run_command(['vs', 'migrate'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getVirtualGuests')
+        self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrate')
+        self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrateDedicatedHost')
+        self.assertIn("No guests require migration at this time", result.output)
+
     def test_vs_migrate_guest(self):
         result = self.run_command(['vs', 'migrate', '-g', '100'])
-        
         self.assert_no_fail(result)
         self.assertIn('Started a migration on', result.output)
         self.assert_not_called_with('SoftLayer_Account', 'getVirtualGuests')

tests/managers/vs/vs_tests.py

@@ -1132,3 +1132,13 @@ def test_get_local_disks_swap(self):
                 }
             }
         ], result)
+
+    def test_migrate(self):
+        result = self.vs.migrate(1234)
+        self.assertTrue(result)
+        self.assert_called_with('SoftLayer_Virtual_Guest', 'migrate', identifier=1234)
+
+    def test_migrate_dedicated(self):
+        result = self.vs.migrate_dedicated(1234, 5555)
+        self.assertTrue(result)
+        self.assert_called_with('SoftLayer_Virtual_Guest', 'migrateDedicatedHost', args=(5555,), identifier=1234)