Fixing samba test and adding details to kerberos job

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/34997/head
Côme Chilliet 3 years ago
parent 7b93a143c8
commit 55baa7b586
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
  1. 2
      .github/workflows/smb-kerberos.yml
  2. 2
      apps/files_external/tests/Storage/SmbTest.php

@ -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

@ -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));
}
}

Loading…
Cancel
Save