Skip to content

Commit b9d87f5

Browse files
authored
Merge pull request #6964 from melissa/maint/5.5.x/run-tests-windows-deets
(maint) Add additional details on how to run spec tests
2 parents 1f138fe + 74c759f commit b9d87f5

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
6565
why this is a problem, and how the patch fixes the problem when applied.
6666
```
6767
* Make sure you have added the necessary tests for your changes.
68-
* Run _all_ the tests to assure nothing else was accidentally broken. First
69-
install all the test dependencies with `bundle install --path .bundle`. Then
70-
either run all the tests serially with `bundle exec rspec spec` or in parallel
71-
with `bundle exec rake parallel:spec[process_count]`
68+
* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md)
7269

7370
## Writing Translatable Code
7471

docs/quickstart.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ be used to send logs to a file, and to adjust the log level:
8181
* `PUPPET_TEST_LOG_LEVEL`: change the log level to adjust how much detail
8282
is captured. It defaults to `notice`; useful values include `info` and
8383
`debug`.
84+
85+
For details on running tests on windows, see [the windows docs](https://github.com/puppetlabs/puppet/blob/master/docs/windows.md).

docs/windows.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
If you'd like to run Puppet from source on Windows platforms, follow the [Quickstart](./quickstart.md) to using bundler and installing the necessary gems on Windows.
44

5-
You will need to install Ruby on Windows from [rubyinstaller.org](http://rubyinstaller.org).
5+
You will need to install Ruby on Windows from [rubyinstaller.org](http://rubyinstaller.org)
6+
or from [Choclately](https://chocolatey.org/packages/ruby).
67

78
C:\> cd C:\work\puppet
89
C:\work\puppet> gem install bundler
9-
C:\work\puppet> bundle install --path .bundle
10+
C:\work\puppet> bundle install --path .bundle --without development extra
1011
C:\work\puppet> bundle exec puppet --version
1112
4.7.1
1213

@@ -68,4 +69,3 @@ Then run the test as:
6869
* Don't assume 'C' drive. Use environment variables to look these up:
6970

7071
"#{ENV['windir']}/system32/netsh.exe"
71-

0 commit comments

Comments
 (0)