diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-12 15:36:50 +0100 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-20 11:22:12 +0100 |
| commit | 55baa7b586398f9ee4b529d57ad38cbdca067ae6 (patch) | |
| tree | 915de0a57b2501b8815d828c819e4ece39af7d6e | |
| parent | 7b93a143c827ae64393865cbafb455cd38745f58 (diff) | |
| download | nextcloud-server-55baa7b586398f9ee4b529d57ad38cbdca067ae6.tar.gz nextcloud-server-55baa7b586398f9ee4b529d57ad38cbdca067ae6.zip | |
Fixing samba test and adding details to kerberos job
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | .github/workflows/smb-kerberos.yml | 2 | ||||
| -rw-r--r-- | apps/files_external/tests/Storage/SmbTest.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml index 3783c0ecfc7..182e9787bfe 100644 --- 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 e1d7b82479d..30040e499c8 100644 --- 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)); } } |