Merge pull request #176 from TAlonglong/issue175

Handle destination as urlparse type. Add test.

trollmoves/movers.py

@@ -52,7 +52,10 @@ def move_it(pathname, destination, attrs=None, hook=None, rel_path=None, backup_
     be appended to the destination path.
 
     """
-    dest_url = urlparse(destination)
+    try:
+        dest_url = urlparse(destination)
+    except AttributeError:
+        dest_url = destination
     if rel_path is not None:
         new_path = os.path.join(dest_url.path, rel_path)
     else:

trollmoves/tests/test_ssh_server.py

@@ -307,5 +307,23 @@ def test_scp_move(self, mock_scp_client, mock_sshclient):
         mocked_scp_client.put.assert_called_once_with(self.origin, urlparse(self.destination_no_port).path)
 
 
+    @patch('paramiko.SSHClient.connect', autospec=True)
+    @patch('scp.SCPClient', autospec=True)
+    def test_move_it_destination_types(self, patch_scpclient, patch_connect):
+        """Test move_it handles destination string and urlparse types."""
+        import os
+        from trollmoves.movers import move_it
+
+        expected_destination = urlparse("scp://hostname/path/name")
+        pathname = os.path.join(self.dest_dir, "dest.ext")
+
+        destination = "scp://hostname/path/name"
+        ret_destination = move_it(pathname, destination)
+        assert ret_destination == expected_destination
+
+        urlparse_destination = urlparse("scp://hostname/path/name")
+        ret_destination = move_it(pathname, urlparse_destination)
+        assert ret_destination == expected_destination
+
 if __name__ == '__main__':
     unittest.main()