[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: rake: Make `rake test` reentrant

2017-12-25 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400200 )

Change subject: rake: Make `rake test` reentrant
..


rake: Make `rake test` reentrant

`rake test` leaves a bunch of files behind in tmp/testenv. If these
files are not removed before the next run of `rake test` the linter will
fail with a long list of duplication messages. Adding a :clean step to
the start of the test run will take care of this by ensuring that the
prior test run's files are removed. This should have no effect on CI
tests, but will make local testing easier.

Change-Id: Iaeb2df655f92943b91f8e2410ae82034d46c53de
---
M Rakefile
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Rakefile b/Rakefile
index 95c90bb..f7c978f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,9 +13,13 @@
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-strings/tasks/generate'
+require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
+
+# Tell `rake clean` to get rid of generated test files
+CLEAN.include('tmp/testenv')
 
 # Work around bug in puppet-lint configuration
 # https://github.com/rodjek/puppet-lint/issues/331
@@ -37,7 +41,7 @@
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
-task test: [:syntax, :spec, :rubocop, :cucumber, :lint, :doc]
+task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc]
 
 desc 'Generate all documentations'
 task :doc do

-- 
To view, visit https://gerrit.wikimedia.org/r/400200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeb2df655f92943b91f8e2410ae82034d46c53de
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: rake: Make `rake test` reentrant

2017-12-25 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400200 )

Change subject: rake: Make `rake test` reentrant
..

rake: Make `rake test` reentrant

`rake test` leaves a bunch of files behind in tmp/testenv. If these
files are not removed before the next run of `rake test` the linter will
fail with a long list of duplication messages. Adding a :clean step to
the start of the test run will take care of this by ensuring that the
prior test run's files are removed. This should have no effect on CI
tests, but will make local testing easier.

Change-Id: Iaeb2df655f92943b91f8e2410ae82034d46c53de
---
M Rakefile
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/400200/1

diff --git a/Rakefile b/Rakefile
index 95c90bb..f7c978f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,9 +13,13 @@
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-strings/tasks/generate'
+require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
+
+# Tell `rake clean` to get rid of generated test files
+CLEAN.include('tmp/testenv')
 
 # Work around bug in puppet-lint configuration
 # https://github.com/rodjek/puppet-lint/issues/331
@@ -37,7 +41,7 @@
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
-task test: [:syntax, :spec, :rubocop, :cucumber, :lint, :doc]
+task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc]
 
 desc 'Generate all documentations'
 task :doc do

-- 
To view, visit https://gerrit.wikimedia.org/r/400200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeb2df655f92943b91f8e2410ae82034d46c53de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits