Fixing samba test and adding details to kerberos job

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml
index 3783c0ecfc7f59f05848c61588f9fda221b9849e..182e9787bfe8081c4f0d49287cbb577e12f59cf8 100644 (file)
--- a/.github/workflows/smb-kerberos.yml
+++ b/.github/workflows/smb-kerberos.yml
@@ -53,8 +53,10 @@ jobs:
           chmod 0777 cookies
 
           DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
+          echo "SAML login"
           docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
             curl -c /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
+          echo "Check we are logged in"
           CONTENT=$(docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
             curl -b /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
           echo $CONTENT

diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php
index e1d7b82479d2cbe12065aa73db1ae828a61753a2..30040e499c89b6d539990a58fcbbcfee4d266870 100644 (file)
--- a/apps/files_external/tests/Storage/SmbTest.php
+++ b/apps/files_external/tests/Storage/SmbTest.php
@@ -122,7 +122,7 @@ class SmbTest extends \Test\Files\Storage\Storage {
                ];
 
                foreach ($expected as $expectedChange) {
-                       $this->assertContains($expectedChange, $changes, 'Actual changes are:' . PHP_EOL . print_r($changes, true), false, false); // dont check object identity
+                       $this->assertTrue(in_array($expectedChange, $changes), 'Actual changes are:' . PHP_EOL . print_r($changes, true) . PHP_EOL . 'Expected to find: ' . PHP_EOL . print_r($expectedChange, true));
                }
        }