Skip to content

Conversation

@phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jan 22, 2019

Currently the local server-under-test is being put into /var/www/owncloud and then when a federated server is also required for a test suite, that is put in /var/www/owncloud/fed-server

This is a recipe for confusion, and it did cause confusion last night due to changes in the way that the acceptance test run.sh finds the location of the skeleton files. Under /var/www/owncloud the skeleton files folder is found twice - in /var/www/owncloud/apps/testing/data... and in /var/www/owncloud/fed-server/apps/testing/data

In core, the fed-server is installed into a completely separate folder tree. This is more realistic - in real life another server will usually even be on a completely separate machine.

This PR changes the location of the servers-under-test to:

local server in /var/www/owncloud/server
federated server in /var/www/owncloud/fed-server (its current location)

pull: true
environment:
- COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
- COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also adjust some old cut-paste errors in phpstan and phan pipeline steps. These are steps that are for future use (the necessary commands are in ```Makefile`` but the code analysis fixes have not been made yet). They are not being actually run in CI yet. That is why these cut-paste errors were not causing any failure.

- chown www-data /var/www/owncloud -R
- chmod 777 /var/www/owncloud/tests/acceptance/filesForUpload -R
- chmod +x /var/www/owncloud/tests/acceptance/run.sh
- chown www-data /var/www/owncloud/server -R
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could use:

Suggested change
- chown www-data /var/www/owncloud/server -R
- chown www-data /var/www/owncloud -R

here and get rid of fix-permissions-federation-server:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, some day. CI takes >2 hours so I don't want to touch code unless I have to!

@codecov
Copy link

codecov bot commented Jan 22, 2019

Codecov Report

Merging #92 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #92   +/-   ##
=========================================
  Coverage     62.75%   62.75%           
  Complexity      568      568           
=========================================
  Files            30       30           
  Lines          2081     2081           
=========================================
  Hits           1306     1306           
  Misses          775      775

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6702a06...5968395. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jan 22, 2019

Codecov Report

Merging #92 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #92   +/-   ##
=========================================
  Coverage     62.75%   62.75%           
  Complexity      568      568           
=========================================
  Files            30       30           
  Lines          2081     2081           
=========================================
  Hits           1306     1306           
  Misses          775      775

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6702a06...5968395. Read the comment docs.

@phil-davis phil-davis merged commit 218b75a into master Jan 22, 2019
@delete-merged-branch delete-merged-branch bot deleted the put-local-and-fed-servers-in-separate-folders branch January 22, 2019 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants