Skip to content

Conversation

@nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Mar 30, 2018

These changes should fix our tests.
This check was not skipping tests: https://github.com/scality/S3/blob/master/tests/functional/aws-node-sdk/test/multipleBackend/utils.js#L40

@nicolas2bert nicolas2bert force-pushed the fx/functional-tests branch from ac932d5 to ff6df3f Compare April 3, 2018 00:39
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

1 similar comment
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ironman-machine
Copy link
Contributor

CONFLICT (add/add): Merge conflict in tests.bash
CONFLICT (add/add): Merge conflict in lib/Config.js

it('should contain config', done => {
queryReport(done, response => {
if (!response.config || !response.config.locationConstraints) {
if (!response.config || !response.config.overlayVersion) {
Copy link
Contributor Author

@nicolas2bert nicolas2bert Apr 3, 2018

Choose a reason for hiding this comment

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

NOTE: The way we do the report config cleanup has changed: https://github.com/scality/S3/pull/1183/files#diff-2157ec89ef3a5f5eefc407fecbdba988R14

@nicolas2bert nicolas2bert force-pushed the fx/functional-tests branch from ee6511c to abfd54f Compare April 3, 2018 18:12
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@rachedbenmustapha rachedbenmustapha merged commit 90a0e11 into forward/orbit Apr 3, 2018
@rachedbenmustapha rachedbenmustapha deleted the fx/functional-tests branch April 3, 2018 21:44
nicolas2bert added a commit that referenced this pull request Apr 5, 2018
* FX: functional tests

* [SQUASH ME] FX TESTS: cleanup(config) changed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants