Skip to content

[Stable10] test check statusphp#29296

Merged
phil-davis merged 5 commits into
stable10from
stable10-test-check-statusphp
Oct 25, 2017
Merged

[Stable10] test check statusphp#29296
phil-davis merged 5 commits into
stable10from
stable10-test-check-statusphp

Conversation

@SergioBertolinSG

Copy link
Copy Markdown
Contributor

Backport of #29265

@SergioBertolinSG SergioBertolinSG changed the title Stable10 test check statusphp [Stable10] test check statusphp Oct 19, 2017
@codecov

codecov Bot commented Oct 19, 2017

Copy link
Copy Markdown

Codecov Report

Merging #29296 into stable10 will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #29296      +/-   ##
==============================================
+ Coverage       58.41%   58.43%   +0.01%     
  Complexity      17706    17706              
==============================================
  Files            1059     1059              
  Lines           59376    59377       +1     
==============================================
+ Hits            34686    34694       +8     
+ Misses          24690    24683       -7
Impacted Files Coverage Δ Complexity Δ
settings/templates/panels/admin/apps.php 100% <0%> (ø) 0% <0%> (ø) ⬇️
lib/private/User/AccountMapper.php 66.32% <0%> (+7.14%) 25% <0%> (ø) ⬇️

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 694f4ca...0ccc3da. Read the comment docs.

@phil-davis phil-davis force-pushed the stable10-test-check-statusphp branch from 757dc94 to 1fe6894 Compare October 19, 2017 15:12
@phil-davis

Copy link
Copy Markdown
Contributor

@SergioBertolinSG the Jenkins had a problem with a Jenkins restart that happened. I rebased this so that the CI will start again. Maybe it will pass in a few hours???

@DeepDiver1975 DeepDiver1975 added this to the development milestone Oct 19, 2017
@phil-davis phil-davis force-pushed the stable10-test-check-statusphp branch from 1fe6894 to 7cd9082 Compare October 23, 2017 12:23
@phil-davis

Copy link
Copy Markdown
Contributor

and rebased again to see if Jenkins will last the distance this time.

@phil-davis

Copy link
Copy Markdown
Contributor

Jenkins fails because of:

16:27:30   Scenario: Status.php is correct                                       # /var/lib/jenkins/workspace/owncloud-core_core_PR-29296-AIKVVJCJWZPZ4MQBZ7AXKLNPKRJASD4AFJEAG2Q2TMG33FVLFMSA/tests/integration/features/status.feature:3
16:27:30 [Mon Oct 23 16:27:30 2017] ::1:40212 [200]: /status.php
16:27:30     When requesting status.php                                          # FeatureContext::getStatusPhp()
16:27:31     Then the status.php with versions fixed responded should match with # FeatureContext::statusPhpRespondedShouldMatch()
16:27:31       """
16:27:31       {"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"$CURRENT_VERSION","versionstring":"$CURRENT_VERSION_STRING","edition":"Community","productname":"ownCloud"}
16:27:31       """
16:27:31       Failed asserting that two strings are equal.
16:27:31       --- Expected
16:27:31       +++ Actual
16:27:31       @@ @@
16:27:31       -'{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"10.0.4.0","versionstring":"10.0.4","edition":"Community","productname":"ownCloud"}'
16:27:31       +'{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"10.0.4.0","versionstring":"10.0.4 beta1","edition":"Community","productname":"ownCloud"}'

The substitution of $CURRENT_VERSION_STRING does not have the "beta1" on the end. But actually I cannot find "CURRENT_VERSION_STRING" anywhere other than in the integration tests. How is that variable created.substituted??? My grep and PHPstorm search skills have eluded me.

@SergioBertolinSG @PVince81

@SergioBertolinSG

Copy link
Copy Markdown
Contributor Author

@phil-davis that string is not really a variable, it is a fake variable to make clear that there is a substitution. I used "x.x.x.x" but after review it was suggested to show it this way.

@SergioBertolinSG

Copy link
Copy Markdown
Contributor Author

If 0ccc3da works it should be forward ported to master.

@phil-davis

phil-davis commented Oct 25, 2017

Copy link
Copy Markdown
Contributor

Forward port of last commit is in PR #29349
When CI for that passes, we can merge that and also merge this stable10 PR.

@phil-davis phil-davis merged commit 73d2bb1 into stable10 Oct 25, 2017
@phil-davis phil-davis deleted the stable10-test-check-statusphp branch October 25, 2017 16:05
@lock

lock Bot commented Aug 2, 2019

Copy link
Copy Markdown

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants