Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SqlServerDsc: Attempt to mitigate issue #1260 #1268

Merged
merged 18 commits into from
Jan 21, 2019

Conversation

johlju
Copy link
Member

@johlju johlju commented Jan 15, 2019

Pull Request (PR) description

  • Changes to SqlServerDsc
    • Reverting the change that was made as part of the issue #1260
      in the previous release, as it only mitigated the issue, it did not
      solve the issue.
    • Removed the container testing since that broke the integration tests,
      possible due to using excessive amount of memory on the AppVeyor build
      worker. This will make the unit tests to take a bit longer to run.
      (issue #1260).
    • The unit tests and the integration tests are now run in two separate
      build workers in AppVeyor. One build worker runs the integration tests,
      while a second build worker runs the unit tests. The build workers runs
      in parallel on paid accounts, but sequentially on free accounts.
      (issue #1260).
    • Clean up error handling in some of the integration tests that was
      part of a workaround for a bug in Pester. The bug is resolved, and
      the error handling is not again built into Pester.
  • Changes to SqlSetup

This Pull Request (PR) fixes the following issues

Attempt to mitigate issue #1260

Task list

  • Added an entry under the Unreleased section of the change log in the CHANGELOG.md.
    Entry should say what was changed, and how that affects users (if applicable).
  • Resource documentation added/updated in README.md.
  • Resource parameter descriptions added/updated in README.md, schema.mof
    and comment-based help.
  • Comment-based help added/updated.
  • Localization strings added/updated in all localization files as appropriate.
  • Examples appropriately added/updated.
  • Unit tests added/updated. See DSC Resource Testing Guidelines.
  • Integration tests added/updated (where possible). See DSC Resource Testing Guidelines.
  • New/changed code adheres to DSC Resource Style Guidelines and Best Practices.

This change is Reviewable

- Reverting the change that was made as part of the issue dsccommunity#1260
  in the previous release, as it only mitigated the issue, it did not
  solve the issue.
- Updated the integration test to stop the named instance while installing
  the other instances to mitigate issue dsccommunity#1260.
@johlju johlju added the needs review The pull request needs a code review. label Jan 15, 2019
@codecov-io
Copy link

codecov-io commented Jan 15, 2019

Codecov Report

Merging #1268 into dev will decrease coverage by <1%.
The diff coverage is n/a.

Impacted file tree graph

@@         Coverage Diff          @@
##            dev   #1268   +/-   ##
====================================
- Coverage    98%     97%   -1%     
====================================
  Files        34      34           
  Lines      4197    4197           
====================================
- Hits       4137    4106   -31     
- Misses       60      91   +31

Copy link
Member Author

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 4 files at r1.
Reviewable status: 3 of 4 files reviewed, 2 unresolved discussions


Tests/Integration/MSFT_SqlSetup.config.ps1, line 415 at r1 (raw file):

'StopSqlServer

Should be 'Star...' here


Tests/Integration/MSFT_SqlSetup.Integration.Tests.ps1, line 651 at r1 (raw file):

                    catch
                    {
                        Write-Verbose -Message ('{0} {1}' -f $integrationErrorMessagePrefix, $_) -Verbose

We should not need this anymore, since laster Pester release. Throughout.

@johlju johlju added waiting for code fix A review left open comments, and the pull request is waiting for changes to be pushed by the author. and removed needs review The pull request needs a code review. labels Jan 15, 2019
Copy link
Member Author

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewable status: 2 of 4 files reviewed, all discussions resolved (waiting on @johlju)


Tests/Integration/MSFT_SqlSetup.config.ps1, line 415 at r1 (raw file):

Previously, johlju (Johan Ljunggren) wrote…
'StopSqlServer

Should be 'Star...' here

Done


Tests/Integration/MSFT_SqlSetup.Integration.Tests.ps1, line 651 at r1 (raw file):

Previously, johlju (Johan Ljunggren) wrote…

We should not need this anymore, since laster Pester release. Throughout.

Done

@johlju
Copy link
Member Author

johlju commented Jan 20, 2019

Closing this PR as this does not solve the problem. Will try to use parallel testing to solve this issue instead.

@johlju johlju closed this Jan 20, 2019
@johlju
Copy link
Member Author

johlju commented Jan 20, 2019

Reopening and have switch testing to parallel testing (or sequentially on free AppVeyor accounts).

@johlju johlju reopened this Jan 20, 2019
@johlju johlju added the needs review The pull request needs a code review. label Jan 20, 2019
@johlju johlju removed the waiting for code fix A review left open comments, and the pull request is waiting for changes to be pushed by the author. label Jan 20, 2019
@johlju
Copy link
Member Author

johlju commented Jan 20, 2019

Really strange that the code coverage in the build is missing rows, but it doesn't when running code coverage locally. 🤔 I will ignore it for now, it's a problem for another day (another PR). 🙂

Copy link
Member Author

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewed 47 of 48 files at r3, 2 of 2 files at r4.
Reviewable status: all files reviewed, 2 unresolved discussions


Tests/Integration/MSFT_SqlSetup.config.ps1, line 46 at r4 (raw file):

            # Properties for mounting media
            ImagePath                             = "$env:TEMP\SQL2016.iso"
            #ImagePathServicePack                  = "$env:TEMP\SqlUpdates\SQLServer2016SP2-KB4052908-x64-ENU.exe"

We should remove this commented code


Tests/Integration/MSFT_SqlSetup.Integration.Tests.ps1, line 125 at r4 (raw file):

has hash

maybe switch to SHA1

Copy link
Member Author

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewable status: 47 of 49 files reviewed, all discussions resolved (waiting on @johlju)


Tests/Integration/MSFT_SqlSetup.config.ps1, line 46 at r4 (raw file):

Previously, johlju (Johan Ljunggren) wrote…

We should remove this commented code

Done


Tests/Integration/MSFT_SqlSetup.Integration.Tests.ps1, line 125 at r4 (raw file):

Previously, johlju (Johan Ljunggren) wrote…
has hash

maybe switch to SHA1

Done

Copy link
Member Author

@johlju johlju left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r5.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@johlju johlju merged commit 4f59191 into dsccommunity:dev Jan 21, 2019
@johlju johlju deleted the fix-issue-1260 branch January 21, 2019 07:03
@johlju johlju removed the needs review The pull request needs a code review. label Jan 25, 2019
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.

2 participants