Use copy and not inplace remove password + working case test

2 files changed, 9 insertions, 3 deletions

diff --git a/test/test_repo.py b/test/test_repo.py
index ac4c6660..8dc17833 100644
--- a/test/test_repo.py
+++ b/test/test_repo.py
@@ -240,7 +240,6 @@ class TestRepo(TestBase):
 
     @with_rw_directory
     def test_leaking_password_in_clone_logs(self, rw_dir):
-        """Check that the password is not printed on the logs"""
         password = "fakepassword1234"
         try:
             Repo.clone_from(
@@ -249,6 +248,10 @@ class TestRepo(TestBase):
                 to_path=rw_dir)
         except GitCommandError as err:
             assert password not in str(err), "The error message '%s' should not contain the password" % err
+        # Working example from a blank private project
+        Repo.clone_from(
+            url="https://gitlab+deploy-token-392045:mLWhVus7bjLsy8xj8q2V@gitlab.com/mercierm/test_git_python",
+            to_path=rw_dir)
 
     @with_rw_repo('HEAD')
     def test_max_chunk_size(self, repo):
diff --git a/test/test_util.py b/test/test_util.py
index a4963264..ddc5f628 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -325,7 +325,6 @@ class TestUtils(TestBase):
         self.assertEqual(t1._name, t2._name)
 
     def test_remove_password_from_command_line(self):
-        """Check that the password is not printed on the logs"""
         password = "fakepassword1234"
         url_with_pass = "https://fakeuser:{}@fakerepo.example.com/testrepo".format(password)
         url_without_pass = "https://fakerepo.example.com/testrepo"
@@ -334,6 +333,10 @@ class TestUtils(TestBase):
         cmd_2 = ["git", "clone", "-v", url_without_pass]
         cmd_3 = ["no", "url", "in", "this", "one"]
 
-        assert password not in remove_password_if_present(cmd_1)
+        redacted_cmd_1 = remove_password_if_present(cmd_1)
+        assert password not in " ".join(redacted_cmd_1)
+        # Check that we use a copy
+        assert cmd_1 is not redacted_cmd_1
+        assert password in " ".join(cmd_1)
         assert cmd_2 == remove_password_if_present(cmd_2)
         assert cmd_3 == remove_password_if_present(cmd_3)