a few minor unit test fixes

Author: allmightyspiff

tests/CLI/modules/block_tests.py

@@ -111,7 +111,9 @@ def test_volume_detail_name_identifier(self):
                 'storageType': {
                     'keyName': {'operation': '*= BLOCK_STORAGE'}
                 },
-                'username': {'operation': '_= SL-12345'}}}
+                'username': {'operation': '_= SL-12345'}
+                }
+        }
 
         self.assert_called_with('SoftLayer_Account', 'getIscsiNetworkStorage', filter=expected_filter)
         self.assert_called_with('SoftLayer_Network_Storage', 'getObject', identifier=100)

tests/managers/block_tests.py

@@ -1030,3 +1030,15 @@ def test_setCredentialPassword(self):
     def test_list_block_volume_limit(self):
         result = self.block.list_block_volume_limit()
         self.assertEqual(SoftLayer_Network_Storage.getVolumeCountLimits, result)
+
+    def test_get_ids_from_username(self):
+        result = self.block._get_ids_from_username("test")
+        self.assert_called_with('SoftLayer_Account', 'getIscsiNetworkStorage')
+        self.assertEqual([100], result)
+
+    def test_get_ids_from_username_empty(self):
+        mock = self.set_mock('SoftLayer_Account', 'getIscsiNetworkStorage')
+        mock.return_value = []
+        result = self.block._get_ids_from_username("test")
+        self.assert_called_with('SoftLayer_Account', 'getIscsiNetworkStorage')
+        self.assertEqual([], result)

tests/managers/file_tests.py

@@ -879,3 +879,15 @@ def test_order_file_modified_endurance(self):
     def test_list_file_volume_limit(self):
         result = self.file.list_file_volume_limit()
         self.assertEqual(SoftLayer_Network_Storage.getVolumeCountLimits, result)
+
+    def test_get_ids_from_username(self):
+        result = self.file._get_ids_from_username("test")
+        self.assert_called_with('SoftLayer_Account', 'getNasNetworkStorage')
+        self.assertEqual([1], result)
+
+    def test_get_ids_from_username_empty(self):
+        mock = self.set_mock('SoftLayer_Account', 'getNasNetworkStorage')
+        mock.return_value = []
+        result = self.file._get_ids_from_username("test")
+        self.assert_called_with('SoftLayer_Account', 'getNasNetworkStorage')
+        self.assertEqual([], result)